1

science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java

@@ -707,7 +707,7 @@ public class CommonEnum {
         projectAssign("projectAssign", "项目分配"),
         assignDelete("assignDelete", "删除评分记录"),
 
-        taskSave("taskBookSave", "合同书保存"),
+        taskSave("taskBookSave", "任务书保存"),
         taskReport("taskBookReport", "合同书上报"),
         taskAudit("taskBookAudit", "合同书审核"),
 

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java

@@ -60,7 +60,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
     @Autowired
     private ComProjectKpitDetailService comProjectKpitDetailService;
     @Autowired
-    private  ComProjectUnitPaymentService comProjectUnitPaymentService;
+    private ComProjectUnitPaymentService comProjectUnitPaymentService;
     @Autowired
     private ComFileService ComFileService;
     @Autowired
@@ -296,15 +296,19 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
 //        dto.setManagementRuleList(managementRuleList);
 
         //附件列表
-        List<ComFileDTO> fileList = ComFileService.getListByObjectId(dto.getProjId(), CommonEnum.fileType.project.getCode());
-        if (null == fileList || fileList.size() == 0)
-            fileList = configureFileList(dto.getSystemType());
-        else
-            fileList = checkNecessaryAttachmentFile(dto.getSystemType(), fileList);
+        List<ComFileDTO> fileList = ComFileService.getListByObjectId(dto.getId(), CommonEnum.fileType.projectTask.getCode());
+        if (null == fileList || fileList.size() == 0) {
+            fileList = ComFileService.getListByObjectId(dto.getProjId(), CommonEnum.fileType.project.getCode());
+            if (null == fileList || fileList.size() == 0)
+                fileList = configureFileList(dto.getSystemType());
+            else
+                fileList = checkNecessaryAttachmentFile(dto.getSystemType(), fileList);
+        }
         dto.setFileList(fileList);
-        return dto;
 
+        return dto;
     }
+
     private void LoadProjectKPIInfo(ComProjectTaskDTO dto) {
         List<ComProjectKpitDTO> ProjectKPIList = comProjectKpitDetailService.getProjectKpitDetailStatistic(dto.getId());
         if (null == ProjectKPIList || ProjectKPIList.size() == 0)
@@ -435,8 +439,6 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
 
     @Transactional
     public String save(ComProjectTaskDTO dto) {
-        if (dto.getTaskState().equals(CommonEnum.taskState.noWrite.getCode()))
-            dto.setTaskState(CommonEnum.taskState.draft.getCode());
         String id = "";
         ComProjectTask task = new ComProjectTask();
         task.setProjId(dto.getProjId());
@@ -448,6 +450,8 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
             task = convert2Entity(dto);
             id = this.update(task);
         }
+        // 附件
+        ComFileService.insertList(dto.getFileList(), dto.getId(), CommonEnum.fileType.projectTask.getCode());
         return id;
     }
 
@@ -458,7 +462,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
             throw new BusinessException("合同书不存在！");
         if (!ComProjectTask.getTaskState().equals(CommonEnum.taskState.waitSubmit.getCode()) && !ComProjectTask.getTaskState().equals(CommonEnum.taskState.returnModify.getCode()))
             throw new BusinessException("合同书已上报");
-        comProjectAuditService.report(ComProjectTask.getReportYear(), model.getAuditObjectId(), model.getAuditType(),null, unitId, treeCode);
+        comProjectAuditService.report(ComProjectTask.getReportYear(), model.getAuditObjectId(), model.getAuditType(), null, unitId, treeCode);
         // 更新任务书状态
         this.updateState(model.getAuditObjectId(), CommonEnum.taskState.review.getCode());
     }
@@ -490,6 +494,6 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
             taskState = CommonEnum.taskState.failed.getCode();
         }
         if (null != taskState)
-            this.updateState(dto.getAuditObjectId(),taskState);
+            this.updateState(dto.getAuditObjectId(), taskState);
     }
 }