Merge remote-tracking branch 'websoft/dev'

2026-11-04 23:58:02 +08:00
parent d496e42a0d a82c2f7c77
commit 54908de0f3
2 changed files with 5 additions and 1 deletions
@@ -68,7 +68,7 @@ public class ContractManageVO extends ContractManage {
 	private String effectiveType;

 	@TableField(exist = false)
-	@Schema(description = "客商（匹配甲/乙/丙方）")
+	@Schema(description = "客商筛选：按甲方/乙方名称模糊匹配（丙方未落库，不参与）")
 	private String partyName;

 	@TableField(exist = false)
@@ -691,6 +691,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		queryWrapper.eq(Func.isNotEmpty(contractManage.getProjectId()), ContractManage::getProjectId, contractManage.getProjectId())
 			.like(Func.isNotEmpty(contractManage.getContractNo()), ContractManage::getContractNo, contractManage.getContractNo())
 			.like(Func.isNotEmpty(contractManage.getContractName()), ContractManage::getContractName, contractManage.getContractName())
+			// 客商即签约主体，合同表只存甲/乙方名称串（丙方未落库），命中任一方即返回
+			.and(Func.isNotEmpty(contractManage.getPartyName()), wrapper -> wrapper
+				.like(ContractManage::getPartyA, contractManage.getPartyName())
+				.or().like(ContractManage::getPartyB, contractManage.getPartyName()))
 			.like(Func.isNotEmpty(contractManage.getProjectName()) && Func.isEmpty(contractManage.getProjectId()),
 				ContractManage::getProjectName, contractManage.getProjectName())
 			.like(Func.isNotEmpty(contractManage.getOrganizationName()), ContractManage::getOrganizationName, contractManage.getOrganizationName())