实施前期、项目计划附件处理

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectImplementEarlyService.java

@@ -6,6 +6,7 @@ import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.Collections3;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectType.dao.ProjectTypeDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectBasedDataDao;
@@ -27,6 +28,7 @@ import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.dao.WorkActivityProcessDao;
@@ -106,6 +108,8 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
     private ActivityService activityService;
     @Autowired
     private WorkActivityProcessDao workActivityProcessDao;
+    @Autowired
+    private WorkattachmentService workattachmentService;
 
     public ProjectImplementEarly get(String id) {
         return super.get(id);
@@ -209,12 +213,10 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                     workattachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
                         //新增
-                        workattachment.preInsert();
-                        workattachmentDao.insert(workattachment);
+                        workattachmentService.insertOnWorkAttachment(workattachment);
                     } else {
                         //修改
-                        workattachment.preUpdate();
-                        workattachmentDao.update(workattachment);
+                        workattachmentService.updateOnWorkAttachment(workattachment);
                     }
                 } else {
                     //删除
@@ -294,12 +296,10 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                     workattachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
                         //新增
-                        workattachment.preInsert();
-                        workattachmentDao.insert(workattachment);
+                        workattachmentService.insertOnWorkAttachment(workattachment);
                     } else {
                         //修改
-                        workattachment.preUpdate();
-                        workattachmentDao.update(workattachment);
+                        workattachmentService.updateOnWorkAttachment(workattachment);
                     }
                 } else {
                     //删除
@@ -566,10 +566,12 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                     if ("yes".equals(projectFollowReport.getAct().getFlag())) {
                         workActivityProcess.setIsApproval("1");
                         vars.put("pass", true);
+                        vars.put("passs", true);
                         notifyRole = "审批通过";
                     } else {
                         workActivityProcess.setIsApproval("2");
                         vars.put("pass", false);
+                        vars.put("passs",false);
                         user = createUser;
                         notifyRole = "调整项目";
                     }
@@ -582,10 +584,12 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
                     if("yes".equals(projectFollowReport.getAct().getFlag())){
                         workActivityProcess.setIsApproval("1");
                         vars.put("pass",true);
+                        vars.put("passs",true);
                     }else{
                         workActivityProcess.setIsApproval("2");
                         projectFollowReport.setStatus(ProjectStatusEnum.RECALL.getValue());
                         vars.put("pass",false);
+                        vars.put("passs",false);
                     }
                     break;
                 }
@@ -596,7 +600,19 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         projectFollowReport.getAct().setComment(comment);
         projectFollowReport.preUpdate();
         // 提交流程任务
-        actTaskService.complete(projectFollowReport.getAct().getTaskId(), projectFollowReport.getAct().getProcInsId(), projectFollowReport.getAct().getComment(), vars);
+        //actTaskService.complete(projectFollowReport.getAct().getTaskId(), projectFollowReport.getAct().getProcInsId(), projectFollowReport.getAct().getComment(), vars);
+        //判断是否是审核通过
+        if("yes".equals(projectFollowReport.getAct().getFlag())){
+            actTaskService.complete(projectFollowReport.getAct().getTaskId(), projectFollowReport.getAct().getProcInsId(), projectFollowReport.getAct().getComment(), vars);
+        }else{
+            //不通过需要查询审核组角色id
+            List<Act> list2 = actTaskService.toMyStartedList(projectFollowReport.getProcessInstanceId());
+            // 提交流程任务
+            //如果是驳回，并且审核角色为多个，需要对每个角色的审核流都进行处理
+            for (Act actInfo: list2) {
+                actTaskService.complete(actInfo.getTask().getId(), actInfo.getProcInsId(), projectFollowReport.getAct().getComment(), vars);
+            }
+        }
         boolean state = actTaskService.isProcessEnd(projectFollowReport.getAct().getProcInsId());
         List<User> users = new ArrayList<>();
         List<User> userList = new ArrayList<>();
@@ -842,7 +858,8 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         if (com.jeeplus.common.utils.StringUtils.isNotBlank(monthly.getId())){
             Workattachment workattachment = new Workattachment();
             workattachment.setAttachmentId(monthly.getId());
-            List<Workattachment> list = workattachmentDao.findList(workattachment);
+            List<Workattachment> list = workattachmentService.findList(workattachment);
+            workattachmentService.attachmentManageOnUrl(list);
             return list;
         }
         return null;