修改检验检测待办

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

@@ -101,7 +101,7 @@ public class CommonserviceImpl {
         model.setRelationId(params.getOrDefault("instanceId","").toString());
         model.setRoutePath(params.getOrDefault("routePath","").toString());
         model.setStartDate((Date) params.getOrDefault("startDate",""));
-        model.setStartUserId(params.getOrDefault("startUser","").toString());
+        model.setStartUserId(params.getOrDefault("startUserId","").toString());
         model.setTaskContent(params.getOrDefault("taskContent","").toString());
         model.setTaskType(params.getOrDefault("taskType","").toString());
         model.setTaskTypeLabel(params.getOrDefault("taskTypeLabel","").toString());
@@ -131,6 +131,7 @@ public class CommonserviceImpl {
         model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
         model.setEndUserId(reginParams.getUserModel().getUserId());
         model.setEndDate(new Date());
+        model.setRoutePath(model.getRoutePath().replace("roleIds","role").replace("edit","look"));
         model.setFinishStatus(true);
         Systemctl.taskV2Client.update(model,model.getSequenceNbr());
 

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

@@ -208,9 +208,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
             }
 
-            Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
-            List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
-            String roleIds = String.join(",", userOrgRoleList);
+          // Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
+          // List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
+          // String roleIds = String.join(",", userOrgRoleList);
             String urlParams = null;
             try {
                 model.setEquip(null);
@@ -224,7 +224,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                         .put("taskStatus",FlowStatusEnum.TO_BE_PROCESSED.getCode()).put("taskStatusLabel",FlowStatusEnum.TO_BE_PROCESSED.getName()).put("taskName",taskName).put("taskType", model.getBizType()).put("taskTypeLabel", BizTypeEnum.getNameByCode(model.getBizType())).put("taskContent","")
                         .put("taskTitle",reginParams.getUserModel().getUserName()+"发起了"+taskName).put("taskDesc","").put("taskCode",model.getApplicationNo())
                         .put("extras",JSON.toJSONString(model)).put("createUserId",reginParams.getUserModel().getUserName()).put("startUserId",reginParams.getUserModel().getUserId())
-                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds)+"&"+urlParams)
+                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",model.getNextExecuteIds())+"&"+urlParams)
                         .build());
             }
 
@@ -324,9 +324,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             params.put("taskStatusLabel",FlowStatusEnum.TO_BE_FINISHED.getName());
             TaskV2Model taskV2Model = commonservice.updateTaskModel(params);
 
-            Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
-            List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
-            String roleIds = String.join(",", userOrgRoleList);
+          // Map<String, Object> userOrgRoleMap = FeignUtil.remoteCall(() -> Privilege.userOrgRoleClient.getme());
+          // List<String> userOrgRoleList = (List<String>) userOrgRoleMap.get("roleId");
+          // String roleIds = String.join(",", userOrgRoleList);
             String urlParams = null;
             try {
                 model.setEquip(null);
@@ -336,10 +336,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             }
             commonservice.buildTaskModel(MapBuilder.<String, Object>create().put("instanceId", model.getProcessInstanceId()).put("startDate",new Date())
                         .put("agencyCode",reginParams.getUserModel().getAgencyCode()).put("userId",reginParams.getUserModel().getUserId()).put("startUser",reginParams.getUserModel().getUserId()).put("startUserId",reginParams.getUserModel().getUserId())
-                        .put("taskStatus",FlowStatusEnum.REJECTED.getCode()).put("taskStatusLabel",FlowStatusEnum.REJECTED.getName()).put("taskName",taskName).put("taskType", model.getBizType()).put("taskTypeLabel", BizTypeEnum.getNameByCode(model.getBizType())).put("taskContent","")
+                        .put("taskStatus",FlowStatusEnum.TO_BE_PROCESSED.getCode()).put("taskStatusLabel",FlowStatusEnum.TO_BE_PROCESSED.getName()).put("taskName",taskName).put("taskType", model.getBizType()).put("taskTypeLabel", BizTypeEnum.getNameByCode(model.getBizType())).put("taskContent","")
                         .put("taskTitle",reginParams.getUserModel().getUserName()+"发起了"+taskName).put("taskDesc","").put("taskCode",model.getApplicationNo())
                         .put("extras",JSON.toJSONString(model)).put("createUserId",reginParams.getUserModel().getUserName()).put("startUserId",reginParams.getUserModel().getUserId())
-                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds)+"&"+urlParams)
+                        .put("routePath",url.replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",model.getNextExecuteIds())+"&"+urlParams)
                      //   .put("routePath",url.replace("{sequenceNbr}",String.valueOf(model.getSequenceNbr())).replace("{userId}",reginParams.getUserModel().getUserId()).replace("{roleIds}",roleIds))
                         .build());
 
@@ -536,8 +536,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
         String role = (String) nextNodeInfo.get("role");
         taskV2Model.setExecuteUserIds(role);
+        Map<String, Object> map = BeanUtil.beanToMap(taskV2Model);
+        map.put("instanceId",taskV2Model.getRelationId());
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
-        commonservice.buildTaskModel(BeanUtil.beanToMap(taskV2Model));
+        map.put("userId",reginParams.getUserModel().getUserId());
+        map.put("executeUserIds",taskV2Model.getStartUserId());
+        commonservice.buildTaskModel(map);
 
         params.put("status", FlowStatusEnum.REJECTED.getCode() + "");
         Boolean rollBack = "1".equals(op) ? true : false;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/bizTypeInfo.json

@@ -2,15 +2,15 @@
   {
     "type":"supervise",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1735205097765367809&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"firstinspect",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1736588187213524994&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"detection",
     "pageType": "look",
-    "url": "/mixuap?appId=1742358052905971713&id=1736642376224501762&roleIds={roleIds}&userId={userId}&pageType=look"
+    "url": "/mixuap?appId=1742358052905971713&id=1736647706878701570&roleIds={roleIds}&userId={userId}&pageType=look"
   },  {
     "type":"supervise",
     "pageType": "edit",