模版修改

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<TmplInscBsnRelRespVO> 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<Map<String, Object> > bseInfoById(String id) {
+        return success(tmplInscBsnRelService.bseInfoById(id));
+    }
+
 }

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;
     /**
     * 关联中间表业务主键

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;
     /**
     * 关联中间表业务主键

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<String, Object>  bseInfoById(String id);
 }

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<String, Object>  bseInfoById(String id) {
+        // 1、通过实例和合同Id获取业务
+        TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelMapper.selectById( id);
+        if (tmplInscBsnRelDO == null) {
+            throw exception(TMPL_INSC_BSN_REL_NOT_EXISTS);
+        }
+
+        List<ValueInfo> valueInfoS = new ArrayList<>();
+        // 2、获取绑定的字段
+        List<TmplInscDatBsnRespVO> 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<TmplInscItmBsnRespVO> 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,

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<TmplInscDatBsnDO> tmplInscDatBsnDOS = tmplInscDatBsnMapper.selectList(TmplInscDatBsnDO::getInscFldId, createReqVO.getInscFldId());
+        List<TmplInscDatBsnDO> tmplInscDatBsnDOS = tmplInscDatBsnMapper.selectList(TmplInscDatBsnDO::getInscFldId, createReqVO.getInscFldId(),TmplInscDatBsnDO::getBsnId, createReqVO.getBsnId());
         if (!tmplInscDatBsnDOS.isEmpty()) {
            throw exception(TMPL_INSC_DAT_BSN_EXISTS);
        }

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);

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 @@
         <result column="PPR_CTRT_NUM" property="paperContractNumber"/>
         <result column="AGR_NUM" property="agreementNumber"/>
         <result column="RMK" property="remark"/>
-        <result column="MTRG_TP" property="meteringType"/>
+        <result column="MTNG_TP" property="meteringType"/>
         <result column="AGT_NUM" property="agentNumber"/>
         <result column="AGT_NAME" property="agentName"/>
         <result column="CTRT_NUM" property="contractNumber"/>