更新

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

@@ -12,5 +12,5 @@ public interface MissionDao extends JpaRepository<Mission, Long> {
 
     long countAllByActivityIdAndStatus(long activityId, int status);
 
-    Mission findByProcessIdAndUserUsernameAndTemplateIdAndStatusAndType(long processId, String username, long templateId, int status, int type);
+    Mission findByProcessIdAndTemplateIdAndStatusAndType(long processId, long templateId, int status, int type);
 }

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

@@ -3,7 +3,11 @@ package com.keymobile.rest.dao;
 import com.keymobile.rest.model.UserTemplateMapper;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface UserTemplateMapperDao extends JpaRepository<UserTemplateMapper, Long> {
 
+    List<UserTemplateMapper> findAllByTemplateId(long templateId);
 
+    List<UserTemplateMapper> findAllByUserIdAndActivityStatus(long userId, int status);
 }

src/main/java/com/keymobile/rest/model/Activity.java

@@ -21,6 +21,8 @@ public class Activity implements Serializable {
     public static int TYPE_AUTO = 2;
     public static int TYPE_MANUAL = 1;
 
+    public static int STATUS_WAIT = 1;
+    public static int STATUS_BEGIN = 2;
     /**
      * 报送频度 按年 按周 按月 按日 自动推送
      */
@@ -48,6 +50,8 @@ public class Activity implements Serializable {
     @Column(nullable = false, name = "create_at")
     private Timestamp createAt;
 
+    @Column(columnDefinition = ("integer(2) comment '状态'"))
+    private Integer status;
 
     /**
      * 发送人

src/main/java/com/keymobile/rest/model/Template.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.sql.Timestamp;
 
 /**
- * spreadJs 配置的报表
+ * spreadJs 配置的报表 activiti 组概念
  */
 @Data
 @Entity

src/main/java/com/keymobile/rest/model/UserTemplateMapper.java

 package com.keymobile.rest.model;
 
-
 import lombok.Data;
 
 import javax.persistence.*;
@@ -23,9 +22,12 @@ public class UserTemplateMapper implements Serializable {
     @Column(nullable = false, columnDefinition = ("bigint(22) comment '用户id'"))
     private long userId;
 
-    @Column(nullable = false, columnDefinition = ("bigint(22) comment '模板id'"))
-    private long templateId;
-
     @Column(nullable = false, name = "create_at")
     private Timestamp createAt;
+
+    @ManyToOne
+    private Template template;
+
+    @ManyToOne
+    private Activity activity;
 }

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

@@ -30,6 +30,8 @@ public interface FeignAuthService {
     @GetMapping("/users/find")
     List<Map> getUsersByOrgId(@RequestParam("orgId") long orgId);
 
+    @GetMapping("/userById")
+    Map getUserById(@RequestParam("id") long id);
 
     /**
      * 获取所有用户组

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

@@ -17,15 +17,14 @@ public class MissionService {
     @Autowired
     private MissionDao missionDao;
 
-    public Mission save(User user, Template template) {
+    public Mission save(long userId, Template template) {
         Mission info = new Mission();
         info.setTemplate(template);
         // 初始的开始状态
         info.setStatus(Mission.STATUS_BEGIN);
-        info.setUser(user);
+        info.setUserId(userId);
         info.setType(Mission.TYPE_RECORD);
-        Timestamp now = Timestamp.valueOf(DateUtil.getDateTime());
-        info.setCreateAt(now);
+        info.setCreateAt(DateUtil.getTimestamp());
         info = missionDao.save(info);
         return info;
     }
@@ -40,7 +39,7 @@ public class MissionService {
     }
 
     public Mission findByProcessIdAndUsernameAndTemplateIdAndStatusAndType(long processId, String username, long templateId, int status) {
-        return missionDao.findByProcessIdAndUserUsernameAndTemplateIdAndStatusAndType(processId, username, templateId, 1, status);
+        return missionDao.findByProcessIdAndTemplateIdAndStatusAndType(processId, templateId, 1, status);
     }
 
     public List<Mission> findAllByTemplateIdAndStatus(long templateId, int status) {

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

@@ -13,13 +13,12 @@ public class UserTemplateMapperService {
     @Autowired
     private UserTemplateMapperDao userTemplateMapperDao;
 
-
-    public UserTemplateMapper findById(long id) {
-        return userTemplateMapperDao.getOne(id);
+    public List<UserTemplateMapper> findAllByTemplateId(long templateId) {
+        return userTemplateMapperDao.findAllByTemplateId(templateId);
     }
 
-    public List<UserTemplateMapper> findAll() {
-        return userTemplateMapperDao.findAll();
+    public List<UserTemplateMapper> findAllByUserIdAndActivityStatus(long userId, int status) {
+        return userTemplateMapperDao.findAllByUserIdAndActivityStatus(userId, status);
     }
 
     public void save(UserTemplateMapper userTemplateMapper) {

src/main/resources/application-test.yml

@@ -26,8 +26,8 @@ spring:
   jpa:
     show-sql: false
     database-platform: org.hibernate.dialect.MySQL5Dialect
-  #    hibernate:
-  #      ddl-auto: update
+    hibernate:
+      ddl-auto: update
   #47.105.193.165:3306/dev0   192.168.0.192:3306/cmb_dev test test
   datasource:
     url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
@@ -52,7 +52,7 @@ server:
   port: 8110
 
 app:
-  active-process: MoreSubProcess.bpmn
+  active-process: MoreSubProcessStandard.bpmn
 
 swagger2:
   host: localhost:8110

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

@@ -10,6 +10,7 @@ import org.activiti.engine.repository.Deployment;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,8 +38,8 @@ public class ProcessTest {
     @Resource
     private HistoryService historyService;
     // 默认启动的固化流程
-    @Value("${app.active-process}")
-    private String process;
+//    @Value("${app.active-process}")
+    private String process = "MoreSubProcessStandard.bpmn";
 
 //    @Test
     public void createActivitiTask() {
@@ -65,27 +66,35 @@ public class ProcessTest {
 
         // 指定发起人
         Map<String, Object> variables = new HashMap<>();
-        variables.put("inputUser", "发起人chenws");
+        variables.put("manager", "你妈的发起人啊圣诞节阿思");
+        variables.put("groups", Arrays.asList("组1", "组2", "组3"));
 
         //启动流程
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processDefinition.getKey(), variables);
+        List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
 
+        tasks.forEach(task -> {
+            if(StringUtils.isEmpty(task.getAssignee())) {
+//                taskService.claim(task.getId(), "肥仔宋");
+            }
+            System.out.println(task.getAssignee());
+        });
 
-        // 发起人把流程发送到下一个人
-        Task resultTask = taskService.createTaskQuery().processInstanceId(processInstance.getId()).
-                taskInvolvedUser("发起人chenws").singleResult();
+//        Task resultTask = taskService.createTaskQuery().processInstanceId(processInstance.getId()).
+//                taskInvolvedUser("发起人chenws").singleResult();
 
         //直接提交标准到下个节点
-        taskService.claim(resultTask.getId(), "发起人chenws");
+//        taskService.claim(resultTask.getId(), "发起人chenws");
         //保存审批意见
-        taskService.addComment(resultTask.getId(), processInstance.getId(), "发起人chenws启动分发任务");
+//        taskService.addComment(resultTask.getId(), processInstance.getId(), "发起人chenws启动分发任务");
 
-        Map<String, Object> vars = new HashMap<>();
+//        Map<String, Object> vars = new HashMap<>();
         //   分发录入任务
-        vars.put("candidateUsers", Arrays.asList("chenws1", "chenws2"));
+//        vars.put("candidateUsers", Arrays.asList("chenws1", "chenws2"));
 
         //  提交任务，并把补录人任务划分好
-        taskService.complete(resultTask.getId(), vars);
+//        taskService.complete(resultTask.getId(), vars);
+
 
     }
 
@@ -94,8 +103,15 @@ public class ProcessTest {
 
 //        65046
 
-        Task resultTask = taskService.createTaskQuery().taskId("162506").singleResult();
-        taskService.complete(resultTask.getId());
+//        Task resultTask = taskService.createTaskQuery().taskId("162506").singleResult();
+//        taskService.complete(resultTask.getId());
+
+//        187538
+//        taskService.claim("210033", "chenws2");
+        taskService.complete("210040", ImmutableMap.of());
+
+
+//        taskService.complete(resultTask.getId());
 //                taskService.complete(resultTask.getId(), ImmutableMap.of("needDataAudit", "false", "needConfirm", "true"));
 
 //        taskService.complete(resultTask.getId(), ImmutableMap.of("signConfirm", "false"));