补全部分返回体

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/domain/vo/TaskCenterQcListVo.java

@@ -34,4 +34,6 @@ public class TaskCenterQcListVo implements Serializable {
 
     private Date createTime;
 
+    private Long actualDocument;
+
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/common/CommonDocumentService.java

@@ -122,4 +122,11 @@ public class CommonDocumentService {
                 .in(Document::getProjectId, projectIds)
         );
     }
+
+    public List<Document> queryByIds(List<Long> documentIds) {
+        if (documentIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return baseMapper.selectByIds(documentIds);
+    }
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/DocumentQcTaskDetailServiceImpl.java

@@ -238,8 +238,10 @@ public class DocumentQcTaskDetailServiceImpl implements IDocumentQcTaskDetailSer
 
         List<Long> taskIds = new ArrayList<>();
         List<Long> projectIds = new ArrayList<>();
+        List<Long> documentIds = new ArrayList<>();
         Map<Long, DocumentQcTask> taskMap = new HashMap<>();
         Map<Long, String> projectMap = new HashMap<>();
+        Map<Long, Document> documentMap = new HashMap<>();
         taskMapper.selectList(Wrappers.lambdaQuery(DocumentQcTask.class).like(StringUtils.isNotBlank(bo.getTaskName()), DocumentQcTask::getName, bo.getTaskName()))
             .forEach(e -> {
                 taskIds.add(e.getId());
@@ -255,6 +257,9 @@ public class DocumentQcTaskDetailServiceImpl implements IDocumentQcTaskDetailSer
             pageQuery.build(),
             buildListOnTaskCenterWrapper(bo, taskIds, projectIds)
         );
+        page.getRecords().forEach(e -> documentIds.add(e.getDocumentId()));
+
+        documentService.queryByIds(documentIds).forEach(e -> documentMap.put(e.getId(), e));
 
         return TableDataInfo.build(page.convert(e -> {
             TaskCenterQcListVo vo = new TaskCenterQcListVo();
@@ -268,6 +273,7 @@ public class DocumentQcTaskDetailServiceImpl implements IDocumentQcTaskDetailSer
             vo.setNote(e.getNote());
             vo.setExecuteTime(e.getExecutionTime());
             vo.setCreateTime(e.getCreateTime());
+            vo.setActualDocument(documentMap.get(e.getDocumentId()).getActualDocument());
             return vo;
         }));
     }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/DocumentServiceImpl.java

@@ -232,7 +232,7 @@ public class DocumentServiceImpl implements IDocumentService {
                 MessageFormat.format(
                     template.getContent(),
                     user.getNickName(),
-                    bo.getName(),
+                    Arrays.stream(bo.getName().split("-")).filter(e -> !e.equals("NA")).collect(Collectors.joining("-")),
                     projectService.queryById(bo.getProjectId()).getName(),
                     folderService.getPathById(bo.getFolderId(), bo.getProjectId()),
                     DateUtils.formatDateTime(bo.getSubmitDeadline())
@@ -312,7 +312,7 @@ public class DocumentServiceImpl implements IDocumentService {
             MessageFormat.format(
                 template.getContent(),
                 auditor.getNickName(),
-                document.getName(),
+                Arrays.stream(document.getName().split("-")).filter(e -> !e.equals("NA")).collect(Collectors.joining("-")),
                 projectService.queryById(document.getProjectId()).getName(),
                 folderService.getPathById(document.getFolderId(), document.getProjectId()),
                 DateUtils.formatDateTime(new Date())
@@ -354,7 +354,7 @@ public class DocumentServiceImpl implements IDocumentService {
                 MessageFormat.format(
                     template.getContent(),
                     user.getNickName(),
-                    document.getName(),
+                    Arrays.stream(document.getName().split("-")).filter(e -> !e.equals("NA")).collect(Collectors.joining("-")),
                     projectService.queryById(document.getProjectId()).getName(),
                     folderService.getPathById(document.getFolderId(), document.getProjectId()),
                     DateUtils.formatDateTime(new Date()),
@@ -369,7 +369,7 @@ public class DocumentServiceImpl implements IDocumentService {
                 MessageFormat.format(
                     template.getContent(),
                     user.getNickName(),
-                    document.getName(),
+                    Arrays.stream(document.getName().split("-")).filter(e -> !e.equals("NA")).collect(Collectors.joining("-")),
                     projectService.queryById(document.getProjectId()).getName(),
                     folderService.getPathById(document.getFolderId(), document.getProjectId()),
                     DateUtils.formatDateTime(new Date())