modify

Helius

2020-12-27 2e3e6c850ad0b531c588a4d7efd42df621d0d518

modify

 zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java

New file
@@ -0,0 +1,16 @@
package com.matrix.system.app.action;

import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @author wzy
 * @date 2020-12-27
 **/
@Api(value = "ApiKnowledgeAction", tags = "知识库接口类")
@RestController
@RequestMapping(value = "/api/know")
public class ApiKnowledgeAction {

}

 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -36,6 +36,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
@@ -79,8 +80,25 @@
        queryUse.setVipId(serviceVipProjDto.getVipId());
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
        queryUse.setIsOver(Dictionary.FLAG_NO_N);
        switch (serviceVipProjDto.getType()) {
            case "0" :
                break;
            case "1":
                queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
                queryUse.setIsOver(Dictionary.FLAG_NO_N);
                break;
            case "2":
                queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
                queryUse.setIsOver(Dictionary.FLAG_YES_Y);
                break;
            case "3":
                queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
                break;
            default:
                queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
                queryUse.setIsOver(Dictionary.FLAG_NO_N);
                break;
        }
        queryUse.setQueryKey(serviceVipProjDto.getQueryKey());
        List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
        List<ServiceProjVo> serviceProjVos = SysProjUseMapper.INSTANCE.entityListToProjVoList(projList);

 zq-erp/src/main/java/com/matrix/system/app/dto/ServiceVipProjDto.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "查询参数")
    private String queryKey;

    @ApiModelProperty(value = "类型 0-全部 1-有效 2-有效 3-一个月内过期")
    private String type;

    public Long getVipId() {
        return vipId;
    }
@@ -34,4 +37,12 @@
    public void setQueryKey(String queryKey) {
        this.queryKey = queryKey;
    }

    public String getType() {
        return type;
    }

    public void setType(String type) {
        this.type = type;
    }
}

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java

@@ -40,8 +40,12 @@
    private String isInvalid;

    public String getIsInvalid() {
        Date date = DateUtil.nextNDate(new Date(), 7);
        Date date = DateUtil.getDateAfterMonth(new Date(), 1);
        if (invalidTime != null) {
            if (new Date().after(invalidTime)) {
                return "3";
            }

            if (date.after(invalidTime)) {
                return "1";
            }

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java

@@ -43,8 +43,12 @@
    private String isInvalid;

    public String getIsInvalid() {
        Date date = DateUtil.nextNDate(new Date(), 7);
        Date date = DateUtil.getDateAfterMonth(new Date(), 1);
        if (invalidTime != null) {
            if (new Date().after(invalidTime)) {
                return "3";
            }

            if (date.after(invalidTime)) {
                return "1";
            }

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java

@@ -47,6 +47,9 @@
    @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
    private Date failTime;


    private Date targetFailTime;
    /**
     * 套餐id
     */
@@ -129,6 +132,14 @@

    private String queryKey;

    public Date getTargetFailTime() {
        return targetFailTime;
    }

    public void setTargetFailTime(Date targetFailTime) {
        this.targetFailTime = targetFailTime;
    }

    public String getQueryKey() {
        return queryKey;
    }

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml

@@ -271,7 +271,9 @@
            <if test="record.failTime != null  ">
                and a.FAIL_TIME = #{record.failTime}
            </if>

            <if test="record.targetFailTime != null  ">
                and date_format(#{record.failTime}, '%Y-%m-%d') > date_format(a.FAIL_TIME, '%Y-%m-%d')
            </if>
            <if test="record.price != null and record.price !='' ">
                and a.PRICE = #{record.price}
            </if>