合同接口增加查询参数

src/main/contract/com/yw/contract/client/action/ContractQueryListAction.java

@@ -58,6 +58,8 @@ public class ContractQueryListAction extends RequestAbs {
             String contractNumber = json.optString("contractNumber", ""); // 合同编号
             String contractName = json.optString("contractName", ""); // 合同名称
             String contractType = json.optString("contractType", ""); // 合同类型
+            String clientName = json.optString("clientName", ""); // 客户名称
+            String supplierName = json.optString("supplierName", ""); // 供应商名称
             String isValidStr = json.optString("isValid", ""); // 流程状态
 
             // 验证isValid参数，只允许0、1、3
@@ -93,6 +95,12 @@ public class ContractQueryListAction extends RequestAbs {
             if (StringUtils.isNotEmpty(contractType)) {
                 ph.setParam("contract_search_type", contractType); // 精确匹配，不加%
             }
+            if (StringUtils.isNotEmpty(clientName)) {
+                ph.setParam("supplier_name", "%" + clientName + "%");
+            }
+            if (StringUtils.isNotEmpty(supplierName)) {
+                ph.setParam("supplier_name", "%" + supplierName + "%");
+            }
             if (isValid != null) {
                 ph.setParam("isValid", isValid.toString());
             }

src/main/contract/com/yw/contract/contract/dao/ContractEntryDaoImpl.java

@@ -739,6 +739,9 @@ public class ContractEntryDaoImpl extends BaseDao implements ContractEntryDao {
 		if (null != ph.getParam("contract_search_type") && !"".equals(ph.getParam("contract_search_type"))) {
 			sb.append(" AND ec.contract_type = '" + ph.getParam("contract_search_type") + "'");
 		}
+		if (null != ph.getParam("supplier_name") && !"".equals(ph.getParam("supplier_name"))) {
+			sb.append(" AND ec.supplier_name LIKE '" + ph.getParam("supplier_name") + "'");
+		}
 		// MES接口特殊处理：默认查询isValid为0、1、3的合同
 		if (null != ph.getParam("isValid") && !"".equals(ph.getParam("isValid"))) {
 			sb.append(" AND ec.is_valid = '" + ph.getParam("isValid") + "'");