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

@@ -644,8 +644,7 @@ public class CommonServiceImpl implements ICommonService {
     *流程实例id  instanceId
     **/
     public TaskV2Model  updateTaskModel(Map<String, Object> params){
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-
+        String exeUserId = RequestContext.getExeUserId();
         List<TaskV2Model> result =Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
         TaskV2Model model = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
                 .findFirst()
@@ -655,7 +654,7 @@ public class CommonServiceImpl implements ICommonService {
         }
         model.setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
         model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
-        model.setEndUserId(reginParams.getUserModel().getUserId());
+        model.setEndUserId(exeUserId);
         model.setEndDate(new Date());
         model.setRoutePath(model.getRoutePath().replace("roleIds","role").replace("edit","look"));
         Systemctl.taskV2Client.update(model,model.getSequenceNbr());
@@ -679,11 +678,11 @@ public class CommonServiceImpl implements ICommonService {
         TaskV2Model model = list.get(0);
             Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));
         TaskV2Model lastTaskModel = list.get(1);
-        model.setEndUserId(null);
-        model.setEndDate(null);
-        model.setFlowStatus(0);
-        model.setRoutePath(model.getRoutePath().replace("role","roleIds").replace("look","edit"));
-        Systemctl.taskV2Client.update(model,model.getSequenceNbr());
+        lastTaskModel.setEndUserId(null);
+        lastTaskModel.setEndDate(null);
+        lastTaskModel.setFlowStatus(0);
+        lastTaskModel.setRoutePath(model.getRoutePath().replace("role","roleIds").replace("look","edit"));
+        Systemctl.taskV2Client.update(lastTaskModel,lastTaskModel.getSequenceNbr());
     }
 
     public  <T> String toQueryParams(T obj) throws UnsupportedEncodingException {

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

@@ -136,9 +136,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 equipmentInfos.get(0).put(s, JSON.parseArray(equipmentInfos.get(0).get(s).toString()));
             }
         }
+        Map<String, Object> map = equipmentInfos.get(0);
+        BeanUtil.copyProperties(transferNotice, map);
         return new HashMap<String, Map<String, Object>>() {{
-            this.put("transferNoticeInfo", transferNotice);
-            this.put("equipmentInfo", equipmentInfos.get(0));
+            this.put("transferNoticeInfo", map);
         }};
     }
 

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

@@ -18,5 +18,15 @@
     "type": "installNotice",
     "pageType": "edit",
     "url": "/mixuap?appId=1742358052905971713&id=1734127099570057217&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&formType=edit&noticeStatus=%s&userId=%s&instanceId=%s"
+  },
+  {
+    "type": "changeRegistrationReform",
+    "pageType": "look",
+    "url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=look&noticeStatus=%s&instanceId=%s"
+  },
+  {
+    "type": "changeRegistrationReform",
+    "pageType": "edit",
+    "url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&sequenceNbr=%s&roleIds=%s&nextExecuteIds=%s&pageType=edit&noticeStatus=%s&userId=%s&instanceId=%s"
   }
 ]
\ No newline at end of file