到期合同查询

java110

2021-03-31 83c1b8423486da7d446bb4c1cf1fbe53a9bf7092

到期合同查询

 java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java

@@ -17,6 +17,14 @@
 **/
public class ContractDto extends PageDto implements Serializable {

    /**
     * 33    审核失败
     * 44    合同终止
     */
    public static final String STATE_FAIL = "33";//33 44

    public static final String STATE_COMPLAINT = "44"; //合同终止

    private String aLink;
    private String aContacts;
    private String amount;
@@ -34,6 +42,7 @@
    private String startTime;
    private String endTime;
    private String state;
    private String[] noStates;
    private String stateDesc;
    private String contractCode;
    private String objType;
@@ -255,4 +264,12 @@
    public void setStateDesc(String stateDesc) {
        this.stateDesc = stateDesc;
    }

    public String[] getNoStates() {
        return noStates;
    }

    public void setNoStates(String[] noStates) {
        this.noStates = noStates;
    }
}

 java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml

@@ -226,12 +226,18 @@
        <if test="startTime !=null and startTime != ''">
            and t.start_time= #{startTime}
        </if>
        <if test="endTime !=null and endTime != ''">
            and t.end_time= #{endTime}
        <if test="endTime !=null ">
            and t.end_time &lt;= #{endTime}
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="noStates !=null ">
            and t.state not in
            <foreach collection="noStates" item="item" index="index" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="contractCode !=null and contractCode != ''">
            and t.contract_code= #{contractCode}
        </if>

 service-store/src/main/java/com/java110/store/api/ContractApi.java

@@ -51,14 +51,10 @@
import com.java110.store.bmo.contractTypeTemplate.IUpdateContractTypeTemplateBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;


@RestController
@@ -251,7 +247,8 @@
    /**
     * 微信删除消息模板
     *
     * @param storeId 商户ID
     * @param storeId    商户ID
     * @param expiration 到期合同标记 1 到期合同
     * @return
     * @serviceCode /contract/queryContract
     * @path /app/contract/queryContract
@@ -259,6 +256,7 @@
    @RequestMapping(value = "/queryContract", method = RequestMethod.GET)
    public ResponseEntity<String> queryContract(@RequestHeader(value = "store-id") String storeId,
                                                @RequestParam(value = "state", required = false) String state,
                                                @RequestParam(value = "expiration", required = false) String expiration,
                                                @RequestParam(value = "page") int page,
                                                @RequestParam(value = "row") int row) {
        ContractDto contractDto = new ContractDto();
@@ -266,6 +264,11 @@
        contractDto.setRow(row);
        contractDto.setStoreId(storeId);
        contractDto.setState(state);
        //如果是到期合同
        if ("1".equals(expiration)) {
            contractDto.setNoStates(new String[]{ContractDto.STATE_COMPLAINT, ContractDto.STATE_FAIL});
            contractDto.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
        }
        return getContractBMOImpl.get(contractDto);
    }

@@ -628,9 +631,9 @@
        contractChangePlanPo.setState(ContractChangePlanDto.STATE_W);
        contractChangePlanPo.setRemark(reqJson.getString("changeRemark"));

        ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson,ContractChangePlanDetailPo.class);
        ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanDetailPo.class);
        contractChangePlanDetailPo.setStoreId(storeId);
        return saveContractChangePlanBMOImpl.save(contractChangePlanPo,contractChangePlanDetailPo);
        return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo);
    }

    /**
@@ -686,9 +689,9 @@
    public ResponseEntity<String> queryContractChangePlan(@RequestHeader(value = "store-id") String storeId,
                                                          @RequestParam(value = "page") int page,
                                                          @RequestParam(value = "row") int row,
                                                          @RequestParam(value = "contractId",required = false) String contractId,
                                                          @RequestParam(value = "contractName",required = false) String contractName,
                                                          @RequestParam(value = "planId",required = false) String planId
                                                          @RequestParam(value = "contractId", required = false) String contractId,
                                                          @RequestParam(value = "contractName", required = false) String contractName,
                                                          @RequestParam(value = "planId", required = false) String planId
    ) {
        ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
        contractChangePlanDto.setPage(page);
@@ -795,8 +798,8 @@
     */
    @RequestMapping(value = "/queryContractChangePlanDetail", method = RequestMethod.GET)
    public ResponseEntity<String> queryContractChangePlanDetail(@RequestHeader(value = "store-id") String storeId,
                                                                @RequestParam(value = "planId",required = false) String planId,
                                                                @RequestParam(value = "contractId",required = false) String contractId,
                                                                @RequestParam(value = "planId", required = false) String planId,
                                                                @RequestParam(value = "contractId", required = false) String contractId,
                                                                @RequestParam(value = "page") int page,
                                                                @RequestParam(value = "row") int row) {
        ContractChangePlanDetailDto contractChangePlanDetailDto = new ContractChangePlanDetailDto();