From 06cd3425226b02d8dcfbc2ad58b8f982f64e86bf Mon Sep 17 00:00:00 2001
From: hewencai <2357300448@qq.com>
Date: Wed, 12 Nov 2025 17:52:56 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DocTemplateInstanceRespVO.java         |  9 ++++
 .../DocTemplateInstanceServiceImpl.java       | 43 +++++++++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateInstanceRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateInstanceRespVO.java
index 8eafe4c..40169eb 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateInstanceRespVO.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/doctemplate/vo/DocTemplateInstanceRespVO.java
@@ -60,6 +60,15 @@ public class DocTemplateInstanceRespVO {
     @Schema(description = "版本号", example = "v1.0")
     private String version;
 
+    @Schema(description = "模板名称", example = "采购合同模板")
+    private String templateName;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "更新人", example = "admin")
+    private String updater;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/doctemplate/DocTemplateInstanceServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/doctemplate/DocTemplateInstanceServiceImpl.java
index 55824e5..461674e 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/doctemplate/DocTemplateInstanceServiceImpl.java
+++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/doctemplate/DocTemplateInstanceServiceImpl.java
@@ -149,19 +149,56 @@ public class DocTemplateInstanceServiceImpl implements DocTemplateInstanceServic
     @Override
     public DocTemplateInstanceRespVO getTemplateInstance(Long id) {
         DocTemplateInstanceDO templateInstance = docTemplateInstanceMapper.selectById(id);
-        return DocTemplateInstanceConvert.INSTANCE.convert(templateInstance);
+        DocTemplateInstanceRespVO respVO = DocTemplateInstanceConvert.INSTANCE.convert(templateInstance);
+        
+        // 填充模板名称
+        if (respVO != null && respVO.getTemplateId() != null) {
+            DocTemplateDO template = docTemplateMapper.selectById(respVO.getTemplateId());
+            if (template != null) {
+                respVO.setTemplateName(template.getTmplName());
+            }
+        }
+        
+        return respVO;
     }
 
     @Override
     public PageResult<DocTemplateInstanceRespVO> getTemplateInstancePage(DocTemplateInstancePageReqVO pageReqVO) {
         PageResult<DocTemplateInstanceDO> pageResult = docTemplateInstanceMapper.selectPage(pageReqVO);
-        return DocTemplateInstanceConvert.INSTANCE.convertPage(pageResult);
+        PageResult<DocTemplateInstanceRespVO> respVOPageResult = DocTemplateInstanceConvert.INSTANCE.convertPage(pageResult);
+
+        // 填充模板名称
+        fillTemplateName(respVOPageResult.getList());
+
+        return respVOPageResult;
     }
 
     @Override
     public List<DocTemplateInstanceRespVO> getTemplateInstanceList() {
         List<DocTemplateInstanceDO> list = docTemplateInstanceMapper.selectList();
-        return DocTemplateInstanceConvert.INSTANCE.convertList(list);
+        List<DocTemplateInstanceRespVO> respVOList = DocTemplateInstanceConvert.INSTANCE.convertList(list);
+
+        // 填充模板名称
+        fillTemplateName(respVOList);
+
+        return respVOList;
+    }
+
+    /**
+     * 填充模板名称
+     */
+    private void fillTemplateName(List<DocTemplateInstanceRespVO> list) {
+        if (list == null || list.isEmpty()) {
+            return;
+        }
+        for (DocTemplateInstanceRespVO vo : list) {
+            if (vo.getTemplateId() != null) {
+                DocTemplateDO template = docTemplateMapper.selectById(vo.getTemplateId());
+                if (template != null) {
+                    vo.setTemplateName(template.getTmplName());
+                }
+            }
+        }
     }
 
 }