From 057336c65ac26f320c75db069474fb28982de724 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: Thu, 13 Nov 2025 17:46:47 +0800 Subject: [PATCH] =?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 --- .../templtp/TmplInscBsnRelController.java | 9 +++- .../dataobject/tmpltp/TmplInscDatBsnDO.java | 2 +- .../dataobject/tmpltp/TmplInscItmBsnDO.java | 2 +- .../service/tmpltp/TmplInscBsnRelService.java | 7 +++ .../tmpltp/TmplInscBsnRelServiceImpl.java | 45 ++++++++++++++++++- .../tmpltp/TmplInscDatBsnServiceImpl.java | 2 +- .../tmpltp/TmplInscItmBsnServiceImpl.java | 1 + .../purchaseorder/PurchaseOrderMapper.xml | 6 +-- 8 files changed, 66 insertions(+), 8 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java index 7616847..dd6ee83 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java @@ -124,10 +124,17 @@ public class TmplInscBsnRelController implements BusinessControllerMarker { } @GetMapping("/bsn-info") - @Operation(summary = "根据合id和实例id获取中间表") + @Operation(summary = "根据合同id和实例id获取中间表") @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:query')") public CommonResult bseInfo(@RequestParam("cttId") @Valid @NotEmpty(message = "合同Id不能为空") String cttId, @RequestParam("inscId") @Valid @NotEmpty(message = "模版实例id不能为空") String inscId) { return success(tmplInscBsnRelService.bseInfo(cttId, inscId)); } + @GetMapping("/bsn-info-id") + @Operation(summary = "根据中间表id获取对应字段和条款") + @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:query')") + public CommonResult > bseInfoById(String id) { + return success(tmplInscBsnRelService.bseInfoById(id)); + } + } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscDatBsnDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscDatBsnDO.java index 5ddd4ff..66773b6 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscDatBsnDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscDatBsnDO.java @@ -27,7 +27,7 @@ public class TmplInscDatBsnDO extends BusinessBaseDO { /** * 主键 */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_ID) private String id; /** * 关联中间表业务主键 diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscItmBsnDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscItmBsnDO.java index ba2c182..a27102c 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscItmBsnDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplInscItmBsnDO.java @@ -27,7 +27,7 @@ public class TmplInscItmBsnDO extends BusinessBaseDO { /** * 主键 */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_ID) private String id; /** * 关联中间表业务主键 diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java index c31f05e..0cdd8aa 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java @@ -88,4 +88,11 @@ public interface TmplInscBsnRelService { * @param cttId ,inscId */ TmplInscBsnRelRespVO bseInfo(String cttId,String inscId); + + /** + * 获取中间表 + * + * @param id 中间表id + */ + Map bseInfoById(String id); } 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 bb043ec..293fcde 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 @@ -146,7 +146,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { if (!tmplInscBsnRelRespVO.getDeptIds().isEmpty()) { tmplInscBsnRelRespVO.setDeptRespVOS(deptApi.getDeptList(tmplInscBsnRelRespVO.getDeptIds().stream().map(Long::valueOf).toList()).getData()); // 部门详情 } - TemplateInstanceRespVO templateInstance = SpringUtil.getBean(TemplateInstanceService.class).getTemplateInstance(tmplInscBsnRelRespVO.getInscId()); +// TemplateInstanceRespVO templateInstance = SpringUtil.getBean(TemplateInstanceService.class).getTemplateInstance(tmplInscBsnRelRespVO.getInscId()); // if (templateInstance != null) { // tmplInscBsnRelRespVO.setInscName(!templateInstance.getName().isEmpty() ? templateInstance.getName() : "分类未命名"); // } @@ -351,6 +351,49 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { return BeanUtils.toBean(tmplInscBsnRelDO, TmplInscBsnRelRespVO.class); } + @Override + public Map bseInfoById(String id) { + // 1、通过实例和合同Id获取业务 + TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelMapper.selectById( id); + if (tmplInscBsnRelDO == null) { + throw exception(TMPL_INSC_BSN_REL_NOT_EXISTS); + } + + List valueInfoS = new ArrayList<>(); + // 2、获取绑定的字段 + List tmplInscDatBsnList = tmplInscDatBsnService + .getTmplInscDatBsnListByBsnId(String.valueOf(tmplInscBsnRelDO.getBsnId())); + + + Optional.ofNullable(tmplInscDatBsnList) + .ifPresent(list -> list.forEach(tmplInscDatBsnRespVO -> { + ValueInfo valueInfo = new ValueInfo( + tmplInscDatBsnRespVO.getId(), + tmplInscDatBsnRespVO.getFldKy(), + tmplInscDatBsnRespVO.getFldVal(), + "field", + tmplInscDatBsnRespVO.getInscFldId() + ); + valueInfoS.add(valueInfo); + })); + + // 3、获取条款 + List tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getBsnId())); + Optional.ofNullable(tmplInscItmBsnList) + .ifPresent(list -> list.forEach(tmplInscItmBsnRespVO -> { + ValueInfo valueInfo = new ValueInfo( + tmplInscItmBsnRespVO.getId(), + tmplInscItmBsnRespVO.getItmName(), + tmplInscItmBsnRespVO.getVal(), + "item", + tmplInscItmBsnRespVO.getItmId() + ); + valueInfoS.add(valueInfo); + })); + + return Map.of("data", valueInfoS, "id", tmplInscBsnRelDO.getId()); + } + private record ValueInfo( String id, diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java index cabbfdc..b1e3356 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java @@ -50,7 +50,7 @@ public class TmplInscDatBsnServiceImpl implements TmplInscDatBsnService { return BeanUtils.toBean(tmplInscDatBsn, TmplInscDatBsnRespVO.class); } private void validateTmplInscDatBsnExistsByKey(TmplInscDatBsnSaveReqVO createReqVO) { - List tmplInscDatBsnDOS = tmplInscDatBsnMapper.selectList(TmplInscDatBsnDO::getInscFldId, createReqVO.getInscFldId()); + List tmplInscDatBsnDOS = tmplInscDatBsnMapper.selectList(TmplInscDatBsnDO::getInscFldId, createReqVO.getInscFldId(),TmplInscDatBsnDO::getBsnId, createReqVO.getBsnId()); if (!tmplInscDatBsnDOS.isEmpty()) { throw exception(TMPL_INSC_DAT_BSN_EXISTS); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnServiceImpl.java index dce8514..2c87a57 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnServiceImpl.java @@ -45,6 +45,7 @@ public class TmplInscItmBsnServiceImpl implements TmplInscItmBsnService { validateTmplInscItmBsnExistsByKey(createReqVO); // 插入 TmplInscItmBsnDO tmplInscItmBsn = BeanUtils.toBean(createReqVO, TmplInscItmBsnDO.class); + tmplInscItmBsn.setInscItmId(createReqVO.getInstceItmId()); tmplInscItmBsnMapper.insert(tmplInscItmBsn); // 返回 return BeanUtils.toBean(tmplInscItmBsn, TmplInscItmBsnRespVO.class); diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml index 63636ab..5966463 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml @@ -19,7 +19,7 @@ po.SPLR_NUM, po.SPLR_NAME, po.TP, - po.MTRG_TP, + po.MTNG_TP, po.VCHR_DT, po.PRCH_ORGZ_CD, po.RCV_FACT_NAME, @@ -144,7 +144,7 @@ po.PPR_CTRT_NUM, po.AGR_NUM, po.RMK, - po.MTRG_TP, + po.MTNG_TP, po.UNT, po.AGT_NUM, po.AGT_NAME, @@ -266,7 +266,7 @@ - +