会计项目列表添加合同和客户查询

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -155,6 +155,19 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
             if (StringUtils.isNotBlank(cwProjectRecordsDTO.getReportType())) {
                 queryWrapper.eq("a.report_type", cwProjectRecordsDTO.getReportType());
             }
+            //合同名称
+            if (StringUtils.isNotBlank(cwProjectRecordsDTO.getContractName())) {
+                if("暂无合同".equals(cwProjectRecordsDTO.getContractName())) {
+                    queryWrapper.and(wrapper -> wrapper.isNull("a.contract_id").or().eq("a.contract_id", ""));
+                }else{
+                    queryWrapper.like("cw_wci.contract_name", cwProjectRecordsDTO.getContractName());
+                }
+
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(cwProjectRecordsDTO.getClientContactsName())) {
+                queryWrapper.like("cw_wcb.name", cwProjectRecordsDTO.getClientContactsName());
+            }
         }
 
         IPage<CwProjectRecordsDTO> list = cwProjectRecordsMapper.findList(page, queryWrapper);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -204,6 +204,7 @@ public class CwProjectRecordsDTO extends BaseDTO {
 
     /**
      * 合同委托人
+     * 客户名称
      */
     private String clientContactsName;