任务完成时设置下个节点审批人完成

skyeye-activiti/src/main/java/com/skyeye/activiti/service/impl/ActivitiTaskServiceImpl.java

@@ -303,6 +303,7 @@ public class ActivitiTaskServiceImpl implements ActivitiTaskService {
                         hisModel.put("name", hisTask.getName());//我处理的任务
                         hisModel.put("weatherEnd", 1);//标记流程是否结束；1：结束，0.未结束
                     }
+                    return hisModel;
                 } catch (Exception ee) {
                     LOGGER.warn("queryMyHistoryTaskByUserId get processInstanceId {} is error.", hisTask.getProcessInstanceId(), ee);
                 }
@@ -521,7 +522,7 @@ public class ActivitiTaskServiceImpl implements ActivitiTaskService {
     public void querySubFormMationByTaskId(InputObject inputObject, OutputObject outputObject) throws Exception {
         Map<String, Object> map = inputObject.getParams();
         String taskId = map.get("taskId").toString();
-
+        activitiModelService.deleteProcessInRedisMation("647645");
         // 获取任务自定义id和名称
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         map.put("taskKey", task.getTaskDefinitionKey());
@@ -618,10 +619,20 @@ public class ActivitiTaskServiceImpl implements ActivitiTaskService {
         bean.put("leaveOpinionList", leaveList);
         bean.put("flag", map.get("flag"));//校验参数
         taskService.complete(taskId, bean);
+        LOGGER.info("complete success, processInstanceId is {}.", processInstanceId);
         // 绘制图像
         activitiModelService.queryProHighLighted(processInstanceId);
         // 删除指定流程在redis中的缓存信息
-        activitiModelService.deleteProcessInRedisMation(task.getProcessInstanceId());
+        activitiModelService.deleteProcessInRedisMation(processInstanceId);
+        // 设置下个节点的审批人
+        setNextUserTaskApproval(processInstanceId, map.get("approverId").toString());
+    }
+
+    private void setNextUserTaskApproval(String processInstanceId, String approverId){
+        if(!ToolUtil.isBlank(approverId)){
+            Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).active().singleResult();
+            taskService.setAssignee(task.getId(), approverId);
+        }
     }
 
     private void setApprovalEditMation(Map<String, Object> map, String processInstanceId, String taskId) throws Exception {

skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml

@@ -74,6 +74,7 @@
 		<property id="editStr" name="editStr" ref="" var="审批人修改的内容"/>
 		<property id="pageTypes" name="pageTypes" ref="required,num" var="页面类型 1.指定页面，2.动态表单"/>
 		<property id="flag" name="flag" ref="required,num" var="是否通过：1.通过2.不通过"/>
+		<property id="approverId" name="approverId" ref="" var="下个节点的审批人"/>
 	</url>
 	<url id="activitimode008" path="/post/ActivitiTaskController/queryUserAgencyTasksListByUserId" val="获取用户待办任务" allUse="2" groupName="工作流用户任务操作">
 		<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />

skyeye-common/src/main/java/com/skyeye/jedis/util/JedisClusterConfig.java

@@ -25,6 +25,7 @@ import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
 import redis.clients.jedis.JedisPoolConfig;
 
 import java.lang.reflect.Method;
@@ -143,6 +144,10 @@ public class JedisClusterConfig {
 			@Qualifier("jedisConnectionFactory") JedisConnectionFactory factory) {
 		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
 		redisTemplate.setConnectionFactory(factory);
+		// 设置序列化Key的实例化对象
+		redisTemplate.setKeySerializer(new StringRedisSerializer());
+		// 设置序列化Value的实例化对象
+		redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
 		return redisTemplate;
 	}
 

skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserMapper.xml

@@ -390,6 +390,7 @@
 			a.user_photo userPhoto,
 			a.user_idcard userIdCard,
 			a.user_sex userSex,
+		    a.user_id userId,
 			a.email userEmail,
 			a.phone userPhone,
 			a.home_phone userHomePhone,