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 getTemplateInstancePage(DocTemplateInstancePageReqVO pageReqVO) { PageResult pageResult = docTemplateInstanceMapper.selectPage(pageReqVO); - return DocTemplateInstanceConvert.INSTANCE.convertPage(pageResult); + PageResult respVOPageResult = DocTemplateInstanceConvert.INSTANCE.convertPage(pageResult); + + // 填充模板名称 + fillTemplateName(respVOPageResult.getList()); + + return respVOPageResult; } @Override public List getTemplateInstanceList() { List list = docTemplateInstanceMapper.selectList(); - return DocTemplateInstanceConvert.INSTANCE.convertList(list); + List respVOList = DocTemplateInstanceConvert.INSTANCE.convertList(list); + + // 填充模板名称 + fillTemplateName(respVOList); + + return respVOList; + } + + /** + * 填充模板名称 + */ + private void fillTemplateName(List 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()); + } + } + } } }