修改待办

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TaskModelDto.java

@@ -82,6 +82,9 @@ public class TaskModelDto {
          * 当前业务实体对象
          */
         private Object model;
-
+        /**
+         * 下一节点执行角色
+         */
+        private String nextExecuteUser;
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -84,6 +84,9 @@ public class CommonServiceImpl implements ICommonService {
     @Value("classpath:/json/superviseBusinessCategory.json")
     private Resource superviseBusinessCategory;
 
+
+    @Value("classpath:/json/urlInfo.json")
+    private Resource urlInfo;
     //行政区划redis缓存key
     private static final String PROVINCE = "PROVINCE";
     private static final String CITY = "CITY";
@@ -619,13 +622,18 @@ public class CommonServiceImpl implements ICommonService {
     public void buildTaskModel(List<TaskModelDto> list){
         list.forEach(obj->{
             TaskV2Model model = new TaskV2Model();
-            ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             String urlParams = "";
             try {
                 urlParams = "&"+toQueryParams(obj.getModel());
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
+            List<Map> urlList = JsonUtils.getResourceList(urlInfo);
+            for (Map map : urlList) {
+                if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")){
+                    model.setRoutePath(map.get("url").toString().replace("{roleIds}",obj.getNextExecuteUser()).replace("{userId}",RequestContext.getExeUserId())+urlParams);
+                }
+            }
             model.setRoutePath(obj.getRoutePath()+urlParams);
             BeanUtil.copyProperties(model,obj);
             model.setFlowStatus(0);
@@ -635,7 +643,7 @@ public class CommonServiceImpl implements ICommonService {
             model.setExtras(JSON.toJSONString(obj.getModel()));
             // model.setTerminal(params.getOrDefault("terminal","WEB").toString());
             model.setCreateDate(new Date());
-            model.setRecUserId(reginParams.getUserModel().getUserId());
+            model.setRecUserId( RequestContext.getExeUserId());
             Systemctl.taskV2Client.create(model);
         });
 
@@ -658,6 +666,7 @@ public class CommonServiceImpl implements ICommonService {
         if (model == null ){
             return  null;
         }
+        model.setFlowStatus(1);
         model.setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
         model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
         model.setEndUserId(exeUserId);
@@ -679,7 +688,7 @@ public class CommonServiceImpl implements ICommonService {
      * id  工作流实例id
     **/
     public void rollbackTask(String id){
-            List<TaskV2Model> result =Systemctl.taskV2Client.selectListByRelationId(id).getResult();
+        List<TaskV2Model> result =Systemctl.taskV2Client.selectListByRelationId(id).getResult();
         List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
         TaskV2Model model = list.get(0);
             Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));