update:完善文档模板导出功能
This commit is contained in:
@@ -60,6 +60,15 @@ public class DocTemplateInstanceRespVO {
|
|||||||
@Schema(description = "版本号", example = "v1.0")
|
@Schema(description = "版本号", example = "v1.0")
|
||||||
private String version;
|
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)
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private LocalDateTime createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
|
|||||||
@@ -149,19 +149,56 @@ public class DocTemplateInstanceServiceImpl implements DocTemplateInstanceServic
|
|||||||
@Override
|
@Override
|
||||||
public DocTemplateInstanceRespVO getTemplateInstance(Long id) {
|
public DocTemplateInstanceRespVO getTemplateInstance(Long id) {
|
||||||
DocTemplateInstanceDO templateInstance = docTemplateInstanceMapper.selectById(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
|
@Override
|
||||||
public PageResult<DocTemplateInstanceRespVO> getTemplateInstancePage(DocTemplateInstancePageReqVO pageReqVO) {
|
public PageResult<DocTemplateInstanceRespVO> getTemplateInstancePage(DocTemplateInstancePageReqVO pageReqVO) {
|
||||||
PageResult<DocTemplateInstanceDO> pageResult = docTemplateInstanceMapper.selectPage(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
|
@Override
|
||||||
public List<DocTemplateInstanceRespVO> getTemplateInstanceList() {
|
public List<DocTemplateInstanceRespVO> getTemplateInstanceList() {
|
||||||
List<DocTemplateInstanceDO> list = docTemplateInstanceMapper.selectList();
|
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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user