From 5b551753100135f43aa05a5abaf429be87ae1c26 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: Tue, 11 Nov 2025 17:10:00 +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

---
 .../admin/templtp/TmplInscBsnRelController.java        |  7 +------
 .../base/service/tmpltp/TmplInscBsnRelService.java     |  2 +-
 .../base/service/tmpltp/TmplInscBsnRelServiceImpl.java | 10 ++++++++--
 .../mapper/purchaseorder/PurchaseOrderMapper.xml       |  3 +++
 4 files changed, 13 insertions(+), 9 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 92117d2..7616847 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
@@ -85,12 +85,7 @@ public class TmplInscBsnRelController implements BusinessControllerMarker {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:query')")
     public CommonResult<TmplInscBsnRelRespVO> getTmplInscBsnRel(@RequestParam("id") Long id) {
-        TmplInscBsnRelDO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(id);
-        TmplInscBsnRelRespVO tmplInscBsnRelRespVO = BeanUtils.toBean(tmplInscBsnRel, TmplInscBsnRelRespVO.class);
-        if (tmplInscBsnRelRespVO != null) {
-            tmplInscBsnRelService.getTmplInscBsnRelDetails(tmplInscBsnRelRespVO);
-        }
-        return success(tmplInscBsnRelRespVO);
+        return success(tmplInscBsnRelService.getTmplInscBsnRel(id));
     }
 
     @GetMapping("/page")
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 c990704..c31f05e 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
@@ -53,7 +53,7 @@ public interface TmplInscBsnRelService {
      * @param id 编号
      * @return 模板实例与业务中间
      */
-    TmplInscBsnRelDO getTmplInscBsnRel(Long id);
+    TmplInscBsnRelRespVO getTmplInscBsnRel(Long 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 e96402b..bb043ec 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
@@ -119,8 +119,14 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
     }
 
     @Override
-    public TmplInscBsnRelDO getTmplInscBsnRel(Long id) {
-        return tmplInscBsnRelMapper.selectById(id);
+    public TmplInscBsnRelRespVO getTmplInscBsnRel(Long id) {
+        TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelMapper.selectById(id);
+        TmplInscBsnRelRespVO tmplInscBsnRelRespVO = BeanUtils.toBean(tmplInscBsnRelDO, TmplInscBsnRelRespVO.class);
+        if (tmplInscBsnRelRespVO != null){
+            getTmplInscBsnRelDetails(tmplInscBsnRelRespVO);
+        }
+
+        return tmplInscBsnRelRespVO;
     }
 
     @Override
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 09f0787..63636ab 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,6 +19,7 @@
         po.SPLR_NUM,
         po.SPLR_NAME,
         po.TP,
+        po.MTRG_TP,
         po.VCHR_DT,
         po.PRCH_ORGZ_CD,
         po.RCV_FACT_NAME,
@@ -143,6 +144,7 @@
         po.PPR_CTRT_NUM,
         po.AGR_NUM,
         po.RMK,
+        po.MTRG_TP,
         po.UNT,
         po.AGT_NUM,
         po.AGT_NAME,
@@ -264,6 +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="AGT_NUM" property="agentNumber"/>
         <result column="AGT_NAME" property="agentName"/>
         <result column="CTRT_NUM" property="contractNumber"/>