From a6922e57da86d25c22ac537c257cb660430536b8 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Fri, 14 Nov 2025 14:43:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contractorder/service/contract/ContractServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index d86c5075..97d3450e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -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; } From d382abba106d66a5ad970cb3684e25bf4d8245ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Fri, 14 Nov 2025 14:51:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A8=A1=E7=89=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataobject/tmpltp/TmplInscBsnRelDO.java | 4 +-- .../mysql/tmpltp/TmplInscBsnRelMapper.java | 2 +- .../tmpltp/TmplInscBsnRelServiceImpl.java | 26 +++++++++++-------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscBsnRelDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscBsnRelDO.java index 5c8d4e1f..f03ada34 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscBsnRelDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscBsnRelDO.java @@ -34,8 +34,8 @@ public class TmplInscBsnRelDO extends BusinessBaseDO { /** * 业务主键 */ - @TableField("BSN_ID") - private Long bsnId; + @TableField("REL_ID") + private Long relativityId; /** * 实例主键 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplInscBsnRelMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplInscBsnRelMapper.java index a3c867e3..3647cbc1 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplInscBsnRelMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplInscBsnRelMapper.java @@ -21,7 +21,7 @@ public interface TmplInscBsnRelMapper extends BaseMapperX { default PageResult selectPage(TmplInscBsnRelPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .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()) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java index 293fcde4..296bdcd0 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java @@ -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 tmplInscBsnRelDOS = tmplInscBsnRelMapper.selectList(new LambdaQueryWrapper() - .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 setTmplInscItmBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) { List tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper() - .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 setTmplInscDatBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) { - List tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper()), TmplInscDatBsnRespVO.class); + List tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper().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 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 valueInfoS = new ArrayList<>(); // 2、获取绑定的字段 List 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 tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getBsnId())); + List 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 valueInfoS = new ArrayList<>(); // 2、获取绑定的字段 List 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 tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getBsnId())); + List tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getRelativityId())); Optional.ofNullable(tmplInscItmBsnList) .ifPresent(list -> list.forEach(tmplInscItmBsnRespVO -> { ValueInfo valueInfo = new ValueInfo(