1.修改更名

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationNameMapper.xml

@@ -33,7 +33,8 @@
     ur.use_unit_name as useUnitName,
     ur.new_use_unit_name AS newUseUnitName,
     ur.promoter,
-    ur.next_executor_ids as nextExecutorIds
+    ur.next_executor_ids as nextExecutorIds,
+    ur.next_execute_user_ids as nextExecuteUserIds
     from tzs_jg_change_registration_name ur
     <where>
         and  ur.is_delete = 0

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

@@ -693,22 +693,21 @@ public class CommonServiceImpl implements ICommonService {
         if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
 
 
-            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(params.get("model")));
             String urlParams = "";
             try {
-                urlParams = "&" + toQueryParams(jsonObject);
+                urlParams = "&" + toQueryParams(params.get("model"));
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
                 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");
+                    urlParams = map.get("url").toString().replace("{roleIds}", "") + urlParams + "&nextExecuteUserIds=";
                     break;
                 }
             }
             collect.get(0).setRoutePath(urlParams);
-            for (TaskV2Model taskV2Model : result) {
+            for (TaskV2Model taskV2Model : collect) {
                 taskV2Model.setTaskStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
                 taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskV2Model.setFlowStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
@@ -762,31 +761,23 @@ public class CommonServiceImpl implements ICommonService {
         collect.get(0).setTaskStatusLabel(params.get("taskStatusLabel").toString());
         collect.get(0).setEndUserId(exeUserId);
         collect.get(0).setEndDate(new Date());
-
-//        String[] roleIds = model.getRoutePath().split("roleIds=");
-//        String[] userIds = roleIds[1].split("&userId");
-//        String url = roleIds[0]+"roleIds="+"55555"+"&userId"+ userIds[1];
-//        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())){
-            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(params.get("model")));
             String urlParams = "";
             try {
-                urlParams = "&" + toQueryParams(jsonObject);
+                urlParams = "&" + toQueryParams(params.get("model"));
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
             List<Map> urlList = JsonUtils.getResourceList(urlInfo);
             for (Map map : urlList) {
                 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");
+                    urlParams = map.get("url").toString().replace("{roleIds}", "") + urlParams + "&nextExecuteUserIds=";
                     break;
                 }
             }
             collect.get(0).setRoutePath(urlParams);
-            for (TaskV2Model taskV2Model : result) {
+            for (TaskV2Model taskV2Model : collect) {
                 taskV2Model.setTaskStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
                 taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
                 taskV2Model.setFlowStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));

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

@@ -499,6 +499,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         params.put("taskStatusLabel", flowStatusEnum.getName());
         params.put("flowStatus", this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
         params.put("flowStatusLabel", jgChangeRegistrationName.getAuditStatus());
+        params.put("model", jgChangeRegistrationName);
         return commonService.updateTaskModelNew(params);
     }