zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
潘荣晟
2025-10-30 09:20:26 +08:00
parent 0419b56b11 05a6278d18
commit a92e25c872
214 changed files with 9812 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
View File

File diff suppressed because it is too large Load Diff

5
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractMainDO.java
View File

@@ -394,4 +394,9 @@ public class ContractMainDO extends BusinessBaseDO {
*/
@TableField("BSN_TP")
private String businessType;
/**
* 代理方名称
*/
@TableField("AGT_NAME")
private String agentName;
}

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractMainMapper.java
View File

@@ -17,10 +17,11 @@ public interface ContractMainMapper extends BaseMapperX<ContractMainDO> {
default PageResult<ContractMainDO> selectContractPage(ContractPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ContractMainDO>()
.likeIfPresent(ContractMainDO::getContractName, reqVO.getContractName())
.eqIfPresent(ContractMainDO::getContractPaperNumber, reqVO.getContractPaperNumber())
.likeIfPresent(ContractMainDO::getContractPaperNumber, reqVO.getContractPaperNumber())
.eqIfPresent(ContractMainDO::getDirection, reqVO.getDirection())
.betweenIfPresent(ContractMainDO::getSignDate, reqVO.getSignDate())
.likeIfPresent(ContractMainDO::getPurchaseCompanyName, reqVO.getPurchaseCompanyName())
.likeIfPresent(ContractMainDO::getSalesCompanyName, reqVO.getSalesCompanyName())
.eqIfPresent(ContractMainDO::getBasicAmount, reqVO.getBasicAmount())
.eqIfPresent(ContractMainDO::getStatus, reqVO.getStatus())
.eqIfPresent(ContractMainDO::getBusinessType, reqVO.getBusinessType())