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

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

Browse Source
This commit is contained in:
qianshijiang
2025-11-14 14:54:23 +08:00
parent 2d93ceda4f d382abba10
commit 0d98763496
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscBsnRelDO.java
View File

@@ -34,8 +34,8 @@ public class TmplInscBsnRelDO extends BusinessBaseDO {
/**
* 业务主键
*/
@TableField("BSN_ID")
private Long bsnId;
@TableField("REL_ID")
private Long relativityId;
/**
* 实例主键
*/

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplInscBsnRelMapper.java
View File

@@ -21,7 +21,7 @@ public interface TmplInscBsnRelMapper extends BaseMapperX<TmplInscBsnRelDO> {
default PageResult<TmplInscBsnRelDO> selectPage(TmplInscBsnRelPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<TmplInscBsnRelDO>()
.eqIfPresent(TmplInscBsnRelDO::getBsnId, reqVO.getBsnId())
.eqIfPresent(TmplInscBsnRelDO::getRelativityId, reqVO.getBsnId())
.eqIfPresent(TmplInscBsnRelDO::getInscId, reqVO.getInscId())
.eqIfPresent(TmplInscBsnRelDO::getCntt, reqVO.getCntt())
.eqIfPresent(TmplInscBsnRelDO::getVer, reqVO.getVer())

26
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java
View File

@@ -67,6 +67,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
// fileUpload(createReqVO, templateInstance, type);
// 插入
TmplInscBsnRelDO tmplInscBsnRel = BeanUtils.toBean(createReqVO, TmplInscBsnRelDO.class);
tmplInscBsnRel.setRelativityId(createReqVO.getBsnId());
// tmplInscBsnRel.setBsnId(Long.valueOf(createReqVO.getUuid()));
tmplInscBsnRelMapper.insert(tmplInscBsnRel);
// 返回
@@ -81,6 +82,9 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
validateTmplInscBsnRelExists(updateReqVO.getId());
// 更新
TmplInscBsnRelDO updateObj = BeanUtils.toBean(updateReqVO, TmplInscBsnRelDO.class);
if (updateReqVO.getBsnId()!=null){
updateObj.setRelativityId(updateReqVO.getBsnId());
}
tmplInscBsnRelMapper.updateById(updateObj);
}
@@ -99,9 +103,9 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
// 校验存在
validateTmplInscBsnRelExists(ids);
//删除业务实例字段值
deleteFldOrItmByIds(tmplInscBsnRelMapper.selectByIds(ids).stream().map(TmplInscBsnRelDO::getBsnId).map(String::valueOf).toList(), tmplInscDatBsnService);
deleteFldOrItmByIds(tmplInscBsnRelMapper.selectByIds(ids).stream().map(TmplInscBsnRelDO::getRelativityId).map(String::valueOf).toList(), tmplInscDatBsnService);
//删除业务实例字段值
deleteFldOrItmByIds(tmplInscBsnRelMapper.selectByIds(ids).stream().map(TmplInscBsnRelDO::getBsnId).map(String::valueOf).toList(), tmplInscItmBsnService);
deleteFldOrItmByIds(tmplInscBsnRelMapper.selectByIds(ids).stream().map(TmplInscBsnRelDO::getRelativityId).map(String::valueOf).toList(), tmplInscItmBsnService);
tmplInscBsnRelMapper.deleteByIds(ids);
}
@@ -155,7 +159,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
@Override
public void updateCntt(Long bsnId, String params) {
List<TmplInscBsnRelDO> tmplInscBsnRelDOS = tmplInscBsnRelMapper.selectList(new LambdaQueryWrapper<TmplInscBsnRelDO>()
.eq(TmplInscBsnRelDO::getBsnId, bsnId).orderByDesc(TmplInscBsnRelDO::getVer)
.eq(TmplInscBsnRelDO::getRelativityId, bsnId).orderByDesc(TmplInscBsnRelDO::getVer)
);
if (tmplInscBsnRelDOS.isEmpty()) {
throw exception(TEMPLATE_INSTANCE_FILE_NOT_EXISTS);
@@ -170,7 +174,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
//业务条款
private List<TmplInscItmBsnRespVO> setTmplInscItmBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
List<TmplInscItmBsnRespVO> tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscItmBsnDO>()
.eq(TmplInscItmBsnDO::getBsnId, tmplInscBsnRelRespVO.getBsnId())
.eq(TmplInscItmBsnDO::getBsnId, tmplInscBsnRelRespVO.getId())
), TmplInscItmBsnRespVO.class);
// tmplInscItmBsnRespVOS.forEach(tmplInscItmBsnRespVO -> {
// tmplInscBsnRelRespVO.getInstanceItemRespVOS().forEach(instanceItemRespVO -> {
@@ -184,7 +188,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
//业务字段
private List<TmplInscDatBsnRespVO> setTmplInscDatBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
List<TmplInscDatBsnRespVO> tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscDatBsnDO>()), TmplInscDatBsnRespVO.class);
List<TmplInscDatBsnRespVO> tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscDatBsnDO>().eq(TmplInscDatBsnDO::getBsnId, tmplInscBsnRelRespVO.getId())), TmplInscDatBsnRespVO.class);
// tmplInscDatBsnRespVOS.forEach(tmplInscDatBsnRespVO -> tmplInscBsnRelRespVO.getTemplateInstanceDataRespVOS().forEach(templateInstanceDataRespVO -> {
// if (templateInstanceDataRespVO.getId().toString().equals(tmplInscDatBsnRespVO.getInscFldId())) {
@@ -300,7 +304,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
public Map<String, Object> valueInfo(String cttId, String inscId) {
// 1、通过实例和合同Id获取业务
TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelMapper.selectOne(
TmplInscBsnRelDO::getBsnId, cttId,
TmplInscBsnRelDO::getRelativityId, cttId,
TmplInscBsnRelDO::getInscId, inscId
);
if (tmplInscBsnRelDO == null) {
@@ -310,7 +314,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
List<ValueInfo> valueInfoS = new ArrayList<>();
// 2、获取绑定的字段
List<TmplInscDatBsnRespVO> tmplInscDatBsnList = tmplInscDatBsnService
.getTmplInscDatBsnListByBsnId(String.valueOf(tmplInscBsnRelDO.getBsnId()));
.getTmplInscDatBsnListByBsnId(String.valueOf(tmplInscBsnRelDO.getRelativityId()));
Optional.ofNullable(tmplInscDatBsnList)
@@ -326,7 +330,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
}));
// 3、获取条款
List<TmplInscItmBsnRespVO> tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getBsnId()));
List<TmplInscItmBsnRespVO> tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getRelativityId()));
Optional.ofNullable(tmplInscItmBsnList)
.ifPresent(list -> list.forEach(tmplInscItmBsnRespVO -> {
ValueInfo valueInfo = new ValueInfo(
@@ -345,7 +349,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
@Override
public TmplInscBsnRelRespVO bseInfo(String cttId, String inscId) {
TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelMapper.selectOne(
TmplInscBsnRelDO::getBsnId, cttId,
TmplInscBsnRelDO::getRelativityId, cttId,
TmplInscBsnRelDO::getInscId, inscId
);
return BeanUtils.toBean(tmplInscBsnRelDO, TmplInscBsnRelRespVO.class);
@@ -362,7 +366,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
List<ValueInfo> valueInfoS = new ArrayList<>();
// 2、获取绑定的字段
List<TmplInscDatBsnRespVO> tmplInscDatBsnList = tmplInscDatBsnService
.getTmplInscDatBsnListByBsnId(String.valueOf(tmplInscBsnRelDO.getBsnId()));
.getTmplInscDatBsnListByBsnId(String.valueOf(tmplInscBsnRelDO.getRelativityId()));
Optional.ofNullable(tmplInscDatBsnList)
@@ -378,7 +382,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
}));
// 3、获取条款
List<TmplInscItmBsnRespVO> tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getBsnId()));
List<TmplInscItmBsnRespVO> tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getRelativityId()));
Optional.ofNullable(tmplInscItmBsnList)
.ifPresent(list -> list.forEach(tmplInscItmBsnRespVO -> {
ValueInfo valueInfo = new ValueInfo(

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

@@ -640,7 +640,7 @@ public class ContractServiceImpl implements ContractService {
}
// 查询关联表
SystemRelativityDO systemRelativityDO = systemRelativityMapper.selectOne(TableFieldConstants.BSE_SYS_REL_DOWN_ID, id);
SystemRelativityDO systemRelativityDO = systemRelativityMapper.selectOne(TableFieldConstants.BSE_SYS_REL_DOWN_ID, id.toString());
if (systemRelativityDO == null) {
return null;
}
@@ -666,7 +666,7 @@ public class ContractServiceImpl implements ContractService {
}
// 查询关联表
SystemRelativityDO systemRelativityDO = systemRelativityMapper.selectOne(TableFieldConstants.BSE_SYS_REL_UP_ID, id);
SystemRelativityDO systemRelativityDO = systemRelativityMapper.selectOne(TableFieldConstants.BSE_SYS_REL_UP_ID, id.toString());
if (systemRelativityDO == null) {
return null;
}