fix:跨表导出

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostCatalogUnitManagerImpl.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -78,24 +79,31 @@ public class CostCatalogUnitManagerImpl extends BaseManagerImpl<CostCatalogUnitD
 
 
         List<CostCatalogUnit> records = pageList.getRecords();
-        records.forEach(costCatalogUnit -> {
-            if ("3".equals(costCatalogUnit.getFormatRequired())) {
-                if(fdTemplateMap!=null) {
-                    if (fdTemplateMap.containsKey(costCatalogUnit.getTemplateId())) {
-                        CostSurveyFdTemplate costSurveyFdTemplate = fdTemplateMap.get(costCatalogUnit.getTemplateId());
-                        costCatalogUnit.setSurveyTemplateName(costSurveyFdTemplate.getSurveyTemplateName());
-                    }
-                }else{
-                    costCatalogUnit.setSurveyTemplateName("-");
+        // 映射表
+        Map<String, String> formatMap = new HashMap<>();
+        formatMap.put("1", "文档文件");
+        formatMap.put("2", "Excel");
+        formatMap.put("3", "预置模");
+
+        records.forEach(unit -> {
+            // 类型名称
+            String formatName = formatMap.getOrDefault(unit.getFormatRequired(), "未知类型");
+            unit.setFormatRequiredName(formatName);
+
+            if ("3".equals(unit.getFormatRequired())) {
+                if (fdTemplateMap != null && fdTemplateMap.containsKey(unit.getTemplateId())) {
+                    unit.setSurveyTemplateName(fdTemplateMap.get(unit.getTemplateId()).getSurveyTemplateName());
+                } else {
+                    unit.setSurveyTemplateName("-");
                 }
-            }else{
-                costCatalogUnit.setSurveyTemplateName("-");
+            } else {
+                unit.setSurveyTemplateName("-");
             }
         });
-
         return pageList;
     }
 
+
     @Override
     public List<CostCatalogUnit> getListByCatalogId(String catalogId) {
         LambdaQueryWrapper<CostCatalogUnit> queryWrapper = new LambdaQueryWrapper<>();

assistMg/src/main/java/com/hotent/baseInfo/model/CostCatalogUnit.java

@@ -74,6 +74,7 @@ public class CostCatalogUnit extends BaseModel<CostCatalogUnit> {
     @JsonProperty("formatRequired")
     @NotEmpty(message = "格式要求不能为空")
     private String formatRequired;
+    private String formatRequiredName;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
@@ -90,6 +91,15 @@ public class CostCatalogUnit extends BaseModel<CostCatalogUnit> {
     @TableField(exist = false)
     private String surveyTemplateName;
 
+
+    public String getFormatRequiredName() {
+        return formatRequiredName;
+    }
+
+    public void setFormatRequiredName(String formatRequiredName) {
+        this.formatRequiredName = formatRequiredName;
+    }
+
     public String getSurveyTemplateName() {
         return surveyTemplateName;
     }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectApprovalManagerImpl.java

@@ -424,7 +424,13 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
         CostProjectProccess projectProccess = costProjectProccessManager.getProcessByProjectId(costProjectApproval.getProjectId());
         //节点集合
         List<CostProjectProccessNode> proccessNodeList = costProjectProccessNodeManager.getListByProcessId(projectProccess.getProcessId());
-
+        //初始化开始节点
+        List<CostProjectProccessNode> collect = proccessNodeList.stream().filter(node -> node.getProcessNodeKey().equals(NodeConstant.tjcl.getNodeKey()))
+                .collect(Collectors.toList());
+        CostProjectProccessNode pnode = collect.get(0);
+        pnode.setActUserIds(req.getAuditGroup());
+        pnode.setActStartTime(LocalDateTime.now());
+        costProjectProccessNodeManager.updateById(pnode);
         //政策文件、监审对象提交资料清单、成本调查表
         //监审目录id
         String catalogId = costProjectApproval.getCatalogId();

assistMg/src/main/java/com/hotent/project/req/CostProjectDocumentPageReq.java

@@ -21,4 +21,6 @@ public class CostProjectDocumentPageReq extends PageReq {
     @ApiModelProperty(value = "查看权限类型：0：查看全部，1：查看被监审单位是当前登录用户的，2：查看当前登录人创建的")
     private Integer permissionType=0;
 
+    private String documentName;
+
 }

assistMg/src/main/java/com/hotent/project/service/AsyncMaterialSummaryService.java

@@ -220,6 +220,19 @@ public class AsyncMaterialSummaryService {
             // 继续执行，不中断整个流程
         }
     }
+    //1	卷宗封面
+    //2	卷内目录
+    //3	政府定价成本监审结论报告
+    //4	成本监审通知书
+    //5	成本审核初步意见告知书
+    //6	成本审核初步意见表
+    //7	成本监审集体审议记录
+    //8	成本监审工作底稿
+    //9	成本监审提取资料登记表
+    //10	成本监审补充资料通知书
+    //11	中止定价成本监审通知书
+    //12	送达回证
+    //13	成本监审卷宗备考表
 
     // ==================== 类型1：成本监审报告（含成本监审报告签发稿、送达回证） ====================
     // A.成本监审报告（含成本监审报告签发稿）
@@ -228,8 +241,8 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"成本监审报告"、"成本监审报告签发稿"、"送达回证"
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "政府定价成本监审结论报告".equals(doc.getDocumentName())
-                        || "政府定价成本监审结论报告-送达回证".equals(doc.getDocumentName())
+                .filter(doc -> "3".equals(doc.getDocumentType())
+                        || "3-送达回证".equals(doc.getDocumentType()+"-"+doc.getDocumentTypeName())
                 )
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
@@ -240,7 +253,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -267,7 +281,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("监审主体上传文件");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getScanDocumentUrl() != null ? document.getScanDocumentUrl() : "");
@@ -282,7 +297,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName("成本项目定（调）价依据");
             detail.setDocumentNumber("");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(approval.getAccordingFileUrl());
@@ -299,8 +315,8 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // "成本监审通知书"和"送达回证"
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本监审通知书".equals(doc.getDocumentName())
-                        || "成本监审通知书-送达回证".equals(doc.getDocumentName()))
+                .filter(doc -> "4".equals(doc.getDocumentType())
+                        || "4-送达回证".equals(doc.getDocumentType()+"-"+doc.getDocumentTypeName()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -310,7 +326,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -327,7 +344,7 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"成本资料清单"
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本监审资料提取资料登记表".equals(doc.getDocumentName()))
+                .filter(doc -> "9".equals(doc.getDocumentType()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -337,7 +354,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -357,6 +375,7 @@ public class AsyncMaterialSummaryService {
                     detail.setTaskId(mainTask.getId());
                     detail.setDocumentName(evidence.getMaterialName() != null ? evidence.getMaterialName() : "提取资料登记");
                     detail.setDocumentNumber("");
+                    detail.setAuditedUnitId(childTask.getAuditedUnitId());
                     detail.setAuditedUnitName(childTask.getAuditedUnitName() != null ? childTask.getAuditedUnitName() : "");
                     detail.setFileSource("系统生成电子文书");
                     detail.setPageCount(evidence.getPageCount() != null ? evidence.getPageCount() : 0);
@@ -384,6 +403,7 @@ public class AsyncMaterialSummaryService {
                     detail.setTaskId(mainTask.getId());
                     detail.setDocumentName(upload.getSurveyTemplateName() != null ? upload.getSurveyTemplateName() : "政府定价成本监审调查表");
                     detail.setDocumentNumber("");
+                    detail.setAuditedUnitId(childTask.getAuditedUnitId());
                     detail.setAuditedUnitName(childTask.getAuditedUnitName() != null ? childTask.getAuditedUnitName() : "");
                     detail.setFileSource("监审单位反馈文件");
                     detail.setPageCount(0);
@@ -403,8 +423,8 @@ public class AsyncMaterialSummaryService {
     private void generateType6Details(CostProjectTaskMaterialSummary summary, CostProjectTask mainTask, List<CostProjectTask> childTasks, List<CostProjectDocument> documents) {
         int orderNum = 1;
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本监审补充资料通知书".equals(doc.getDocumentName())
-                        || "成本监审补充资料通知书-送达回证".equals(doc.getDocumentName()))
+                .filter(doc -> "10".equals(doc.getDocumentType())
+                        || "10-送达回证".equals(doc.getDocumentType()+"-"+doc.getDocumentTypeName()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -414,7 +434,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -431,8 +452,8 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"成本审核初步意见告知书"和"送达回证"
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本审核初步意见告知书".equals(doc.getDocumentName())
-                        || "成本审核初步意见告知书-送达回证".equals(doc.getDocumentName()))
+                .filter(doc -> "5".equals(doc.getDocumentType())
+                        || "5-送达回证".equals(doc.getDocumentType()+"-"+doc.getDocumentTypeName()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -442,7 +463,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -459,7 +481,7 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"书面反馈材料"（来源：监审单位反馈文件）
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "书面反馈材料".equals(doc.getDocumentName()))
+                .filter(doc -> "书面反馈材料".equals(doc.getDocumentType()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -469,7 +491,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("监审单位反馈文件");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -491,6 +514,7 @@ public class AsyncMaterialSummaryService {
                     detail.setTaskId(mainTask.getId());
                     detail.setDocumentName("书面反馈材料");
                     detail.setDocumentNumber("");
+                    detail.setAuditedUnitId(childTask.getAuditedUnitId());
                     detail.setAuditedUnitName(childTask.getAuditedUnitName() != null ? childTask.getAuditedUnitName() : "");
                     detail.setFileSource("监审单位反馈文件");
                     detail.setPageCount(0);
@@ -509,7 +533,7 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"成本审核初步意见表"
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本审核初步意见表".equals(doc.getDocumentName()))
+                .filter(doc -> "6".equals(doc.getDocumentType()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -519,7 +543,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -535,7 +560,7 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"成本监审集体审议记录"
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本监审集体审议记录".equals(doc.getDocumentName()))
+                .filter(doc -> "7".equals(doc.getDocumentType()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -545,7 +570,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -565,7 +591,8 @@ public class AsyncMaterialSummaryService {
                 detail.setTaskId(mainTask.getId());
                 detail.setDocumentName("成本监审集体审议记录");
                 detail.setDocumentNumber("");
-                detail.setAuditedUnitName("");
+                detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+                detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
                 detail.setFileSource("系统生成电子文书");
                 detail.setPageCount(0);
                 detail.setAttachmentUrl(deliberate.getAttachmentUrl());
@@ -582,7 +609,7 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"成本监审工作底稿"
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本监审工作底稿".equals(doc.getDocumentName()))
+                .filter(doc -> "8".equals(doc.getDocumentType()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -592,7 +619,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -611,6 +639,7 @@ public class AsyncMaterialSummaryService {
                     detail.setTaskId(mainTask.getId());
                     detail.setDocumentName(record.getSubject() != null ? record.getSubject() + "-工作底稿" : "成本监审工作底稿");
                     detail.setDocumentNumber("");
+                    detail.setAuditedUnitId(childTask.getAuditedUnitId());
                     detail.setAuditedUnitName(childTask.getAuditedUnitName() != null ? childTask.getAuditedUnitName() : "");
                     detail.setFileSource("系统生成电子文书");
                     detail.setPageCount(0);
@@ -629,7 +658,7 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"成本监审提取资料登记表"
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本监审提取资料登记表".equals(doc.getDocumentName()))
+                .filter(doc -> "9".equals(doc.getDocumentType()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -639,7 +668,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("系统生成电子文书");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -660,6 +690,7 @@ public class AsyncMaterialSummaryService {
                     detail.setTaskId(mainTask.getId());
                     detail.setDocumentName(evidence.getMaterialName() != null ? evidence.getMaterialName() : "提取资料登记");
                     detail.setDocumentNumber("");
+                    detail.setAuditedUnitId(childTask.getAuditedUnitId());
                     detail.setAuditedUnitName(childTask.getAuditedUnitName() != null ? childTask.getAuditedUnitName() : "");
                     detail.setFileSource("系统生成电子文书");
                     detail.setPageCount(evidence.getPageCount() != null ? evidence.getPageCount() : 0);
@@ -678,7 +709,7 @@ public class AsyncMaterialSummaryService {
         int orderNum = 1;
         // 获取"成本资料和会计凭证"（来源：被监审单位提交的资料）
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "成本资料和会计凭证".equals(doc.getDocumentName()))
+                .filter(doc -> "成本资料和会计凭证".equals(doc.getDocumentType()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -688,7 +719,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("监审单位反馈文件");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -711,7 +743,8 @@ public class AsyncMaterialSummaryService {
                     detail.setTaskId(mainTask.getId());
                     detail.setDocumentName(material.getInformationName() != null ? material.getInformationName() : "补充资料");
                     detail.setDocumentNumber("");
-                    detail.setAuditedUnitName("");
+                    detail.setAuditedUnitId(childTask.getAuditedUnitId());
+                    detail.setAuditedUnitName(childTask.getAuditedUnitName() != null ? childTask.getAuditedUnitName() : "");
                     detail.setFileSource("监审单位反馈文件");
                     detail.setPageCount(0);
                     detail.setAttachmentUrl(material.getFileUrl());
@@ -727,10 +760,10 @@ public class AsyncMaterialSummaryService {
     // 来源：从“监审文书”中获取。
     private void generateType14Details(CostProjectTaskMaterialSummary summary, CostProjectTask mainTask, List<CostProjectTask> childTasks, List<CostProjectDocument> documents) {
         int orderNum = 1;
-        // 获取"成本资料和会计凭证"（来源：被监审单位提交的资料）
+        // 获取"中止定价成本监审通知书"（来源：被监审单位提交的资料）
         List<CostProjectDocument> matchedDocuments = documents.stream()
-                .filter(doc -> "中止定价成本监审通知书".equals(doc.getDocumentName())
-                        || "中止定价成本监审通知书-送达回证".equals(doc.getDocumentName()))
+                .filter(doc -> "11".equals(doc.getDocumentType())
+                        || "11-送达回证".equals(doc.getDocumentType()+"-"+doc.getDocumentTypeName()))
                 .sorted(Comparator.comparing(doc -> doc.getOrderNum() != null ? doc.getOrderNum() : 0))
                 .collect(Collectors.toList());
 
@@ -740,7 +773,8 @@ public class AsyncMaterialSummaryService {
             detail.setTaskId(mainTask.getId());
             detail.setDocumentName(document.getDocumentName());
             detail.setDocumentNumber(document.getDocumentNumber() != null ? document.getDocumentNumber() : "");
-            detail.setAuditedUnitName("");
+            detail.setAuditedUnitId(mainTask.getAuditedUnitId());
+            detail.setAuditedUnitName(mainTask.getAuditedUnitName() != null ? mainTask.getAuditedUnitName() : "");
             detail.setFileSource("监审单位反馈文件");
             detail.setPageCount(0);
             detail.setAttachmentUrl(document.getActUrl() != null ? document.getActUrl() : "");
@@ -1137,7 +1171,7 @@ public class AsyncMaterialSummaryService {
                 CostProjectTask task = costProjectTaskManager.getById(existingSummary.getTaskId());
                 if (task != null) {
                     task.setArchiveNo(req.getArchiveNo());
-                    task.setArchiveUser(ContextUtil.getCurrentUser().getAccount());
+                    task.setArchiveUser(ContextUtil.getCurrentUser().getFullname());
                     costProjectTaskManager.updateById(task);
                 }
             }
@@ -1364,6 +1398,7 @@ public class AsyncMaterialSummaryService {
         map.put("{卷宗件数}", "1"); // 默认1件
         map.put("{卷宗页数}", String.valueOf(totalPageCount));
         map.put("{第几件}", "1"); // 默认第1件
+        map.put("{备注}", req.getRemark());
 
         return map;
     }

assistMg/src/main/java/com/hotent/util/FileUploadUtil.java

@@ -181,7 +181,7 @@ public class FileUploadUtil {
         // 使用时间戳+随机数避免重名
         String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
         String random = String.valueOf(new Random().nextInt(1000));
-        return name + "_" + timestamp + "_" + random + extension;
+        return name +  timestamp + random + extension;
     }
 
     /**