11/29

src/main/java/cn/cslg/pas/common/vo/business/ProjectTaskVO.java

@@ -22,10 +22,13 @@ public class ProjectTaskVO {
     private String name;
 
     /**
-     * 专题库/报告id
+     * 专题库/报告id/专利挖掘项目id
      */
     private Integer projectId;
 
+    /**
+     * 项目名称
+     */
     private String projectName;
 
     /**
@@ -104,6 +107,9 @@ public class ProjectTaskVO {
      */
     private String createId;
 
+    /**
+     * 创建人名称
+     */
     private String createName;
 
     /**

src/main/java/cn/cslg/pas/controller/ProjectTaskController.java

@@ -39,8 +39,8 @@ public class ProjectTaskController {
     @Autowired
     private TaskHandleResultService taskHandleResultService;
 
-    @Autowired
-    private AssoTaskFileService assoTaskFileService;
+//    @Autowired
+//    private AssoTaskFileService assoTaskFileService;
 
     @Operation(summary = "添加项目开卷审核任务")
     @PostMapping("/addProjectOpenAuditTask")
@@ -95,17 +95,17 @@ public class ProjectTaskController {
     }
 
 
-    @Operation(summary = "查询任务与附件关联")
-    @PostMapping("/getAssoTaskFile")
-    public Response getAssoTaskFile(@RequestBody GetAssoTaskFileDTO getAssoTaskFileDTO) throws IOException {
-        List<AssoTaskFileVO> assoTaskFileVOS = assoTaskFileService.getAssoTaskFile(getAssoTaskFileDTO.getTaskId());
-        return Response.success(assoTaskFileVOS);
-    }
-
-    @Operation(summary = "删除任务与附件关联")
-    @PostMapping("/deleteAssoTaskFile")
-    public String deleteAssoTaskFile(@RequestBody List<Integer> ids){
-        assoTaskFileService.deleteAssoTaskFile(ids);
-        return Response.success();
-    }
+//    @Operation(summary = "查询任务与附件关联")
+//    @PostMapping("/getAssoTaskFile")
+//    public Response getAssoTaskFile(@RequestBody GetAssoTaskFileDTO getAssoTaskFileDTO) throws IOException {
+//        List<AssoTaskFileVO> assoTaskFileVOS = assoTaskFileService.getAssoTaskFile(getAssoTaskFileDTO.getTaskId());
+//        return Response.success(assoTaskFileVOS);
+//    }
+//
+//    @Operation(summary = "删除任务与附件关联")
+//    @PostMapping("/deleteAssoTaskFile")
+//    public String deleteAssoTaskFile(@RequestBody List<Integer> ids){
+//        assoTaskFileService.deleteAssoTaskFile(ids);
+//        return Response.success();
+//    }
 }

src/main/java/cn/cslg/pas/service/business/ProjectTaskService.java

@@ -430,6 +430,7 @@ public class ProjectTaskService extends ServiceImpl<ProjectTaskMapper, ProjectTa
 
     @Override
     public Object deleteMessage(List<Integer> ids) throws IOException {
+        //TODO
         //删除审核结果与文件关联表
         //删除审核结果表
         //删除任务表

src/main/java/cn/cslg/pas/service/business/TaskHandleResultService.java

@@ -110,7 +110,12 @@ public class TaskHandleResultService extends ServiceImpl<TaskHandleResultMapper,
         return taskHandleResult.getId();
     }
 
-
+    /**
+     * 根据分配任务id查询它的文件信息集合以及说明
+     * @param taskId
+     * @return
+     * @throws IOException
+     */
     public GetHandleResultFileVO getTaskHandleResult(Integer taskId) throws IOException {
         //新建任务说明以及文件信息返回VO
         GetHandleResultFileVO getHandleResultFileVO = new GetHandleResultFileVO();
@@ -136,11 +141,13 @@ public class TaskHandleResultService extends ServiceImpl<TaskHandleResultMapper,
                 fileGuids = assoHandleResultFiles.stream().map(AssoHandleResultFile::getFileGuid).collect(Collectors.toList());
             }
         }
+        //调用FMS系统查询文件详情
         if (fileGuids.size() != 0) {
             String res = fileManagerService.getSystemFileFromFMS(fileGuids);
             systemFiles = JSONObject.parseArray(res, SystemFile.class);
         }
         if (systemFiles.size() != 0) {
+            //遍历装载数据
             for (AssoHandleResultFile assoHandleResultFile : assoHandleResultFiles) {
                 HandleResultFileVO handleResultFileVO = new HandleResultFileVO();
                 SystemFile systemFile = systemFiles.stream().filter(item -> item.getGuid().equals(assoHandleResultFile.getFileGuid())).findFirst().orElse(null);