合同模糊查询

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileListQueryModel.java

@@ -17,5 +17,5 @@ public class ContractFileListQueryModel {
     /**
      * 菜单id
      */
-//    private String menuId;
+    private String menuId;
 }

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePagination.java

@@ -14,6 +14,12 @@ import jnpf.base.Pagination;
  */
 @Data
 public class ContractFilePagination extends Pagination {
+
+	/** 合同编码 */
+	private String contractCode;
+
+	/** 合同名称 */
+	private String contractName;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFilePaginationExportModel.java

@@ -20,4 +20,10 @@ public class ContractFilePaginationExportModel extends Pagination {
 
     private String dataType;
 
+    /** 合同编码 */
+    private String contractCode;
+
+    /** 合同名称 */
+    private String contractName;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java

@@ -133,6 +133,17 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
 
             }
         }
+
+        if(StringUtil.isNotEmpty(contractFilePagination.getContractCode())){
+            contract_item0Num++;
+            contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractCode,contractFilePagination.getContractCode());
+        }
+
+        if(StringUtil.isNotEmpty(contractFilePagination.getContractName())){
+            contract_item0Num++;
+            contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractName,contractFilePagination.getContractName());
+        }
+
         if (AllIdList.size() > 0) {
             contractFileQueryWrapper.lambda().in(ContractFileEntity::getId, AllIdList);
         }
@@ -231,6 +242,16 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
 
             }
         }
+        if(StringUtil.isNotEmpty(contractFilePagination.getContractCode())){
+            contract_item0Num++;
+            contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractCode,contractFilePagination.getContractCode());
+        }
+
+        if(StringUtil.isNotEmpty(contractFilePagination.getContractName())){
+            contract_item0Num++;
+            contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractName,contractFilePagination.getContractName());
+        }
+
         if (AllIdList.size() > 0) {
             contractFileQueryWrapper.lambda().in(ContractFileEntity::getId, AllIdList);
         }