Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c4d10fdd09 |
+4
@@ -67,6 +67,10 @@ public class ContractManageVO extends ContractManage {
|
|||||||
@Schema(description = "生效类型筛选")
|
@Schema(description = "生效类型筛选")
|
||||||
private String effectiveType;
|
private String effectiveType;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
@Schema(description = "客商筛选:按甲方/乙方名称模糊匹配(丙方未落库,不参与)")
|
||||||
|
private String partyName;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@Schema(description = "创建人姓名")
|
@Schema(description = "创建人姓名")
|
||||||
private String createUserName;
|
private String createUserName;
|
||||||
|
|||||||
+4
@@ -619,6 +619,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
|
|||||||
queryWrapper.eq(Func.isNotEmpty(contractManage.getProjectId()), ContractManage::getProjectId, contractManage.getProjectId())
|
queryWrapper.eq(Func.isNotEmpty(contractManage.getProjectId()), ContractManage::getProjectId, contractManage.getProjectId())
|
||||||
.like(Func.isNotEmpty(contractManage.getContractNo()), ContractManage::getContractNo, contractManage.getContractNo())
|
.like(Func.isNotEmpty(contractManage.getContractNo()), ContractManage::getContractNo, contractManage.getContractNo())
|
||||||
.like(Func.isNotEmpty(contractManage.getContractName()), ContractManage::getContractName, contractManage.getContractName())
|
.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()),
|
.like(Func.isNotEmpty(contractManage.getProjectName()) && Func.isEmpty(contractManage.getProjectId()),
|
||||||
ContractManage::getProjectName, contractManage.getProjectName())
|
ContractManage::getProjectName, contractManage.getProjectName())
|
||||||
.like(Func.isNotEmpty(contractManage.getOrganizationName()), ContractManage::getOrganizationName, contractManage.getOrganizationName())
|
.like(Func.isNotEmpty(contractManage.getOrganizationName()), ContractManage::getOrganizationName, contractManage.getOrganizationName())
|
||||||
|
|||||||
Reference in New Issue
Block a user