优化变更已办bug

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

@@ -181,10 +181,10 @@
         <if test="contractName !=null and contractName != ''">
             , t.contract_name= #{contractName}
         </if>
-        <if test="startTime !=null and startTime != ''">
+        <if test="startTime !=null ">
             , t.start_time= #{startTime}
         </if>
-        <if test="endTime !=null and endTime != ''">
+        <if test="endTime !=null">
             , t.end_time= #{endTime}
         </if>
         <if test="state !=null and state != ''">

service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java

@@ -257,7 +257,7 @@ public class ContractChangeUserInnerServiceSMOImpl extends BaseServiceSMO implem
         List<ContractChangePlanDto> tmpContractChangePlanDtos = contractChangePlanInnerServiceSMOImpl.queryContractChangePlans(contractChangePlanDto);
 
         for (ContractChangePlanDto tmpContractChangePlanDto : tmpContractChangePlanDtos) {
-            tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getContractId()));
+            tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getPlanId()));
         }
         return tmpContractChangePlanDtos;
     }

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

@@ -330,6 +330,7 @@ public class ContractApi {
                                                 @RequestParam(value = "expiration", required = false) String expiration,
                                                 @RequestParam(value = "objId", required = false) String objId,
                                                 @RequestParam(value = "contractId", required = false) String contractId,
+                                                @RequestParam(value = "contractCode", required = false) String contractCode,
                                                 @RequestParam(value = "page") int page,
                                                 @RequestParam(value = "row") int row) {
         ContractDto contractDto = new ContractDto();
@@ -339,6 +340,7 @@ public class ContractApi {
         contractDto.setState(state);
         contractDto.setObjId(objId);
         contractDto.setContractId(contractId);
+        contractDto.setContractCode(contractCode);
         //如果是到期合同
         if ("1".equals(expiration)) {
             contractDto.setNoStates(new String[]{ContractDto.STATE_COMPLAINT, ContractDto.STATE_FAIL});

service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java

@@ -1,10 +1,8 @@
 package com.java110.store.bmo.contract.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.contract.ContractDto;
 import com.java110.dto.contractAttr.ContractAttrDto;
 import com.java110.dto.contractChangePlan.ContractChangePlanDto;
-import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.entity.audit.AuditUser;
 import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
 import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
@@ -13,8 +11,6 @@ import com.java110.intf.store.IContractInnerServiceSMO;
 import com.java110.store.bmo.contract.IGetContractBMO;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import com.java110.vo.api.resourceOrder.ApiResourceOrderDataVo;
-import com.java110.vo.api.resourceOrder.ApiResourceOrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -37,6 +33,7 @@ public class GetContractBMOImpl implements IGetContractBMO {
 
     @Autowired
     private IContractChangeUserInnerServiceSMO contractChangeUserInnerServiceSMO;
+
     /**
      * @param contractDto
      * @return 订单服务能够接受的报文
@@ -60,14 +57,15 @@ public class GetContractBMOImpl implements IGetContractBMO {
 
         return responseEntity;
     }
+
     @Override
     public ResponseEntity<String> queryContractChangeTask(AuditUser auditUser) {
         long count = contractChangeUserInnerServiceSMO.getUserTaskCount(auditUser);
 
-        List<ContractChangePlanDto> contractChangePlanDtos  = null;
+        List<ContractChangePlanDto> contractChangePlanDtos = null;
 
         if (count > 0) {
-             contractChangePlanDtos = contractChangeUserInnerServiceSMO.getUserTasks(auditUser);
+            contractChangePlanDtos = contractChangeUserInnerServiceSMO.getUserTasks(auditUser);
         } else {
             contractChangePlanDtos = new ArrayList<>();
         }
@@ -83,15 +81,14 @@ public class GetContractBMOImpl implements IGetContractBMO {
 
         long count = contractChangeUserInnerServiceSMO.getUserHistoryTaskCount(auditUser);
 
-        List<ContractDto> contractDtos = null;
+        List<ContractChangePlanDto> contractChangePlanDtos = null;
 
         if (count > 0) {
-            List<ContractChangePlanDto> purchaseApplyDtos = contractChangeUserInnerServiceSMO.getUserHistoryTasks(auditUser);
-            contractDtos = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ContractDto.class);
+            contractChangePlanDtos = contractChangeUserInnerServiceSMO.getUserHistoryTasks(auditUser);
         } else {
-            contractDtos = new ArrayList<>();
+            contractChangePlanDtos = new ArrayList<>();
         }
-        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractChangePlanDtos);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
@@ -99,7 +96,6 @@ public class GetContractBMOImpl implements IGetContractBMO {
     }
 
 
-
     @Override
     public ResponseEntity<String> queryContractTask(AuditUser auditUser) {
         long count = contractApplyUserInnerServiceSMOImpl.getUserTaskCount(auditUser);