评估合同查询调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/controller/WorkContractController.java

@@ -45,11 +45,12 @@ public class WorkContractController {
         String[] contractAmounts = workClientInfo.getContractAmounts();
         String statusList = workClientInfo.getStatusList();
         String status = workClientInfo.getStatus();
+        String contractType = workClientInfo.getContractType();
         QueryWrapper<WorkContractInfo> workContractInfoQueryWrapper = QueryWrapperGenerator.buildQueryCondition(workClientInfo, WorkContractInfo.class);
         if (ObjectUtil.isNotEmpty(workClientInfo) && StringUtils.isNotBlank(workClientInfo.getCreateById())) {
             workContractInfoQueryWrapper.eq("a.create_by_id", workClientInfo.getCreateById()).or().like("c.name", workClientInfo.getCreateById());
         }
-        IPage<WorkContractInfo> list = workContractService.list(page, workContractInfoQueryWrapper, clientName, contractDates, contractAmounts, statusList, status);
+        IPage<WorkContractInfo> list = workContractService.list(page, workContractInfoQueryWrapper, clientName, contractDates, contractAmounts, statusList, status,contractType);
         return ResponseEntity.ok (list);
     }
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/service/WorkContractService.java

@@ -62,11 +62,14 @@ public class WorkContractService {
      * @param
      * @return
      */
-    public IPage<WorkContractInfo> list(Page<WorkContractInfo> page, QueryWrapper<WorkContractInfo> queryWrapper, String clientName, String[] contractDates, String[] contractAmounts,String statusList,String status) {
+    public IPage<WorkContractInfo> list(Page<WorkContractInfo> page, QueryWrapper<WorkContractInfo> queryWrapper, String clientName, String[] contractDates, String[] contractAmounts,String statusList,String status,String contractType) {
         queryWrapper.eq("a.del_flag","0");
         if (contractDates != null) {
             queryWrapper.between("a.contract_date", contractDates[0], contractDates[1]);
         }
+        if (StringUtils.isNotBlank(contractType)){
+            queryWrapper.eq("a.contract_type",contractType);
+        }
         if (contractAmounts != null) {
             if (StringUtils.isNotEmpty(contractAmounts[0])) {
                 queryWrapper.ge("a.contract_amount", contractAmounts[0]);