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

Merge branch 'dev' into test

Browse Source
This commit is contained in:
chenbowen
2025-11-12 15:23:33 +08:00
parent e5e583d2c7 75382dfbeb
commit f5c580cee6
29 changed files with 859 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/international/IntPushContractReqVO.java
View File

@@ -8,7 +8,7 @@ import lombok.Data;
public class IntPushContractReqVO {
@Schema(description = "接口请求号")
private String __requestId_;
private String __requestId__;
@Schema(description = "接口类型")
private String __interfaceType__;
@Schema(description = "操作标志")

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

@@ -376,7 +376,7 @@ public class ContractApiImpl implements ContractApi {
// 返回数据
IntPushContractRespVO body = new IntPushContractRespVO();
body.set__requestId_(pushReqVO.get__requestId_());
body.set__requestId_(pushReqVO.get__requestId__());
body.set__interfaceType__("R_MY_JG_10");
body.setBusiBillCode(pushReqVO.getBusiBillCode());
body.setCode(code);

28
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

@@ -391,11 +391,15 @@ public class ContractServiceImpl implements ContractService {
}
// 查询合同动态字段及条款
TmplInscBsnRelRespVO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(contractMainDO.getBusinessId());
// 设置合同动态字段
respVO.setDynamicsFields(tmplInscBsnRel.getTmplInscDatBsnRespVOS());
// 设置合同动态条款
respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS());
if (contractMainDO.getBusinessId() != null) {
TmplInscBsnRelRespVO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(contractMainDO.getBusinessId());
if (tmplInscBsnRel != null) {
// 设置合同动态字段
respVO.setDynamicsFields(tmplInscBsnRel.getTmplInscDatBsnRespVOS());
// 设置合同动态条款
respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS());
}
}
return respVO;
}
@@ -478,11 +482,15 @@ public class ContractServiceImpl implements ContractService {
}
// 查询合同动态字段及条款
TmplInscBsnRelRespVO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(contractMainDO.getBusinessId());
// 设置合同动态字段
respVO.setDynamicsFields(tmplInscBsnRel.getTmplInscDatBsnRespVOS());
// 设置合同动态条款
respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS());
if (contractMainDO.getBusinessId() != null) {
TmplInscBsnRelRespVO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(contractMainDO.getBusinessId());
if (tmplInscBsnRel != null) {
// 设置合同动态字段
respVO.setDynamicsFields(tmplInscBsnRel.getTmplInscDatBsnRespVOS());
// 设置合同动态条款
respVO.setDynamicsItems(tmplInscBsnRel.getTmplInscItmBsnRespVOS());
}
}
return respVO;
}