Merge branch 'develop_tzs_register' of…

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

@@ -692,9 +692,10 @@ public class CommonServiceImpl implements ICommonService {
 
     /**
      * 待办 撤回
-     * id  工作流实例id
-     **/
-    public void rollbackTask(String id) {
+     * @param id 工作流实例id
+     * @param obj 自己的实体
+     */
+    public void rollbackTask(String id, JSONObject obj) {
         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);
@@ -705,7 +706,20 @@ public class CommonServiceImpl implements ICommonService {
             lastTaskModel.setEndDate(null);
             lastTaskModel.setTaskStatus(0);
             lastTaskModel.setTaskStatusLabel("待处理");
-            lastTaskModel.setRoutePath(model.getRoutePath().replace("role", "roleIds").replace("edit", "look"));
+            lastTaskModel.setFlowCode(obj.get("nextTaskId").toString());
+            String urlParams = "";
+            try {
+                urlParams = "&" + toQueryParams(obj);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            List<Map> urlList = JsonUtils.getResourceList(urlInfo);
+            for (Map map : urlList) {
+                if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("look")) {
+                    model.setRoutePath(map.get("url").toString().replace("{roleIds}",obj.get("nextExecuteUser").toString()) + urlParams);
+                    break;
+                }
+            }
             Systemctl.taskV2Client.update(lastTaskModel, lastTaskModel.getSequenceNbr());
         }
     }

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/JgTransferNoticeServiceImpl.java

@@ -584,7 +584,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
         jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
         jgTransferNoticeMapper.updateById(jgInstallationNotice);
-        commonService.rollbackTask(jgInstallationNotice.getInstanceId());
+        commonService.rollbackTask(jgInstallationNotice.getInstanceId(), JSONObject.parseObject(JSONObject.toJSONString(jgInstallationNotice)));
     }
 
     @Transactional