修改待办route_path

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

@@ -676,8 +676,6 @@ public class CommonServiceImpl implements ICommonService {
         if (collect == null || collect.size() == 0) {
             return null;
         }
-
-
         collect.get(0).setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
         collect.get(0).setFlowStatusLabel(params.get("flowStatusLabel").toString());
         collect.get(0).setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
@@ -691,12 +689,6 @@ public class CommonServiceImpl implements ICommonService {
 //        String tarUrl = url.replaceFirst("&executeUserIds=", "");
 //        tarUrl+"&executeUserIds="
        // model.setRoutePath( roleIds[0]+"roleIds="+"55555"+"&userId"+userIds[1]);
-
-
-
-
-
-
         //当流程完成时将所有待办状态统一修改为已完成
         if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
 
@@ -710,7 +702,7 @@ public class CommonServiceImpl implements ICommonService {
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
-                if (map.get("type").equals(jsonObject.getString("taskType")) && map.get("pageType").equals("look")) {
+                if (map.get("type").equals(collect.get(0).getTaskType()) && map.get("pageType").equals("look")) {
                     urlParams = map.get("url").toString().replace("{roleIds}", jsonObject.getString("nextExecuteUser")) + urlParams + "&nextExecuteUserIds=" + jsonObject.getString("executeUserIds");
                     break;
                 }
@@ -721,7 +713,6 @@ public class CommonServiceImpl implements ICommonService {
                 taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskV2Model.setFlowStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
                 taskV2Model.setFlowStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
-
             }
             Systemctl.taskV2Client.batchUpdate(collect);
         }else {
@@ -729,10 +720,6 @@ public class CommonServiceImpl implements ICommonService {
 
             Systemctl.taskV2Client.update(collect.get(0), collect.get(0).getSequenceNbr());
         }
-
-
-
-
         //修改model并返回 用于组装新待办
         collect.get(0).setEndUserId(null);
         collect.get(0).setTaskStatus(null);
@@ -761,7 +748,6 @@ public class CommonServiceImpl implements ICommonService {
         //         .findFirst()
         //         .orElse(null);
         List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
-
         if (null  ==collect  || collect.size() == 0) {
             TaskV2Model    model = new TaskV2Model();
             model.setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
@@ -770,8 +756,6 @@ public class CommonServiceImpl implements ICommonService {
             model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
             return model;
         }
-
-
         collect.get(0).setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
         collect.get(0).setFlowStatusLabel(params.get("flowStatusLabel").toString());
         collect.get(0).setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
@@ -787,8 +771,6 @@ public class CommonServiceImpl implements ICommonService {
         // model.setRoutePath( roleIds[0]+"roleIds="+"55555"+"&userId"+userIds[1]);
         //当流程完成时将所有待办状态统一修改为已完成
         if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
-
-
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(params.get("model")));
             String urlParams = "";
             try {
@@ -798,7 +780,7 @@ public class CommonServiceImpl implements ICommonService {
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
-                if (map.get("type").equals(jsonObject.getString("taskType")) && map.get("pageType").equals("look")) {
+                if (map.get("type").equals(collect.get(0).getTaskType()) && map.get("pageType").equals("look")) {
                     urlParams = map.get("url").toString().replace("{roleIds}", jsonObject.getString("nextExecuteUser")) + urlParams + "&nextExecuteUserIds=" + jsonObject.getString("executeUserIds");
                     break;
                 }
@@ -809,12 +791,10 @@ public class CommonServiceImpl implements ICommonService {
                 taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskV2Model.setFlowStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
                 taskV2Model.setFlowStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
-
             }
             Systemctl.taskV2Client.batchUpdate(collect);
         }else {
             collect.get(0).setRoutePath(collect.get(0).getRoutePath().replace("roleIds=","roleIds=55555&fq="));
-
             Systemctl.taskV2Client.update(collect.get(0), collect.get(0).getSequenceNbr());
         }
         collect.get(0).setEndUserId(null);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -93,13 +93,13 @@
     "type": "109",
     "pageType": "look",
     "name": "单位变更登记",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1739250036920840194&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
     "type": "109",
     "pageType": "edit",
     "name": "单位变更登记",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1739250036920840194&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "110",