更新

src/main/java/com/keymobile/rest/controller/TaskController.java

@@ -191,31 +191,7 @@ public class TaskController {
     @ApiOperation(value = "修改活动")
     @PostMapping(value = "/update")
     public ApiResponse updateTask(@RequestBody TaskForm form) {
-//        TwinkleValidator.isFalse((form.getId() == null && form.getId() <= 0), "活动id不能为空");
-//        Activity activity = activityService.get(form.getId());
-//        TwinkleValidator.notNull(activity, "活动不存在");
-//        int status = assignment.getStatus();
-//        TwinkleValidator.isFalse(status != Assignment.STATUS_UNRELEASED, "活动已经发起");
-//        TwinkleValidator.notEmpty(form.getName(), "名称不能为空");
-//        TwinkleValidator.notNull(form.getType(), "类型不能为空");
-//        TwinkleValidator.isFalse((form.getExcels() == null || form.getExcels().size() == 0), "补录模板不能为空");
-//        activity.setType(form.getType());
-//        activity.setRemark(form.getRemark());
-//        activity.setName(form.getName());
-//        activityService.update(activity);
-        // 新建excel实例
-//        List<ExcelForm> excelFormList = form.getExcels();
-//        excelFormList.forEach(excelForm -> {
-//            Template template = templateService.get(excelForm.getId());
-//            TwinkleValidator.notNull(template, "模板不存在");
-//            template.setName(excelForm.getName());
-//            template.setConfig(excelForm.getConfig());
-//            template.setRemark(excelForm.getRemark());
-//            template.setDataAt(excelForm.getDataAt());
-//            templateService.update(template);
-//        });
-//        return ApiResponse.ok(activity.getId());
-        return null;
+        return ApiResponse.ok();
     }
 
     @ApiOperation(value = "发起活动")
@@ -226,7 +202,9 @@ public class TaskController {
     public ApiResponse startTask(long taskId) {
         Activity activity = activityService.get(taskId);
         TwinkleValidator.notNull(activity, "活动不存在");
-
+        // 根据活动查找需要填写的人 目前只支持一人
+        List<Template> templateList = activity.getTemplateList();
+        TwinkleValidator.notLessThan(templateList.size(), 1, "补录模板不存在");
 
         // 部署补录流程
         Deployment deploy = repositoryService
@@ -251,35 +229,46 @@ public class TaskController {
         process.setProcessId(processInstance.getId());
         process.setActivity(activity);
         process.setMissionList(null);
-//        process.setStatus();
-//        processService.s
+        process.setStatus(Process.STATUS_BEGIN);
+        processService.save(process);
 
 
         // 发起人把流程发送到下一个人
         Task resultTask = taskService.createTaskQuery().processInstanceId(processInstance.getId()).
                 taskInvolvedUser(inputUser).singleResult();
 
-        // 根据活动查找需要填写的人 目前只支持一人
-        List<Template> templateList = activity.getTemplateList();
-        TwinkleValidator.notLessThan(templateList.size(), 1, "补录模板不存在");
+        //直接提交标准到下个节点
+        taskService.claim(resultTask.getId(), inputUser);
+        //保存审批意见
+        taskService.addComment(resultTask.getId(), processInstance.getId(), "");
 
-        StringBuilder users = new StringBuilder();
-        templateList.forEach(template -> {
-            List<Mission> missionList = missionService.findAllByTemplateIdAndStatus(template.getId(), Mission.STATUS_BEGIN);
-            users.append();
 
+        List<String> userNameList = new ArrayList<>();
 
+        List<Mission> allMissions = new ArrayList<>();
+
+        templateList.forEach(template -> {
+            List<Mission> missionList = missionService.findAllByTemplateIdAndStatus(template.getId(), Mission.STATUS_BEGIN);
+            // 当前所有任务的参与人员
+            missionList.forEach(mission -> {
+                mission.setProcess(process);
+                missionService.save(mission);
+                User user = mission.getUser();
+                userNameList.add(user.getUsername());
+            });
+            allMissions.addAll(missionList);
         });
+        process.setMissionList(allMissions);
+        processService.save(process);
 
 
-        //如果是开始录入环节，需要给出子任务录入人员
-        if (resultTask.getTaskDefinitionKey().indexOf("startEntry") >= 0) {
-            if (StringUtils.isNotBlank(assignees)) {
-                String[] commentUsers = assignees.split(",");
-                vars.put("candiateUserList", Arrays.asList(commentUsers));
+        Map<String, Object> vars = new HashMap<>();
+        //   如果是开始录入环节，需要给出子任务录入人员
+        if (resultTask.getTaskDefinitionKey().contains("startEntry")) {
+            vars.put("candiateUserList", userNameList);
         }
-        }
-
+        //审批任务
+        taskService.complete(resultTask.getId(), vars);
         return ApiResponse.ok();
     }
 

src/main/java/com/keymobile/rest/dao/MissionDao.java

@@ -8,6 +8,6 @@ import java.util.List;
 
 public interface MissionDao extends JpaRepository<Mission, Long> {
 
-    List<Mission> findAllByTemplateIdAAndStatus(long templateId, int status);
+    List<Mission> findAllByTemplateIdAndStatus(long templateId, int status);
 
 }

src/main/java/com/keymobile/rest/service/GroupDataStandardServiceImpl.java

-package com.keymobile.activiti.service;
+package com.keymobile.rest.service;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/com/keymobile/rest/service/MissionService.java

@@ -29,8 +29,13 @@ public class MissionService {
         return info;
     }
 
+    public Mission save(Mission mission) {
+        missionDao.save(mission);
+        return mission;
+    }
+
     public List<Mission> findAllByTemplateIdAndStatus(long templateId, int status) {
-        return missionDao.findAllByTemplateIdAAndStatus(templateId, status);
+        return missionDao.findAllByTemplateIdAndStatus(templateId, status);
     }
 
 }

src/main/java/com/keymobile/rest/service/ProcessService.java

 package com.keymobile.rest.service;
 
 import com.keymobile.rest.dao.ProcessDao;
+import com.keymobile.rest.model.Process;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -11,4 +12,8 @@ public class ProcessService {
     private ProcessDao processDao;
 
 
+    public Process save(Process process) {
+        processDao.save(process);
+        return process;
+    }
 }

src/test/java/com/keymobile/ProcessTest.java

@@ -36,8 +36,7 @@ public class ProcessTest {
 //        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
 //        processEngine.getRepositoryService()
 //                .createDeployment()
-//                .addClasspathResource("demo.bpmn")
-//                .addClasspathResource("demo.bpmn.png")
+//                .addClasspathResource("MoreSubProcessTest.bpmn")
 //                .deploy();
 
     }
@@ -51,7 +50,7 @@ public class ProcessTest {
 //                .complete("32502");
     }
 
-    //    @Test
+//        @Test
     public void zhuguan() {
 //        try {