Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationReformService.java

 package com.yeejoin.amos.boot.module.jg.api.service;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -18,7 +21,7 @@ import java.util.Map;
 public interface IJgChangeRegistrationReformService {
     Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds);
     void save(JSONObject map);
-    void updateExecuteIds(String instanceId, Long sequenceNbr, String operate);
+    void updateExecuteIds(String instanceId, JgChangeRegistrationReform jgChangeRegistrationReform, String operate, ProcessTaskDTO processTaskDTO);
     void flowExecute(Long id, String instanceId, String operate, String comment);
     void withdraw(String instanceId);
     void deleteBatch(List<Long> ids);

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

@@ -626,16 +626,17 @@ public class CommonServiceImpl implements ICommonService {
             for (Map map : urlList) {
                 if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")) {
                     model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()).replace("{userId}", RequestContext.getExeUserId()) + urlParams);
+                    break;
                 }
             }
             model.setFlowStatus(obj.getTaskStatus());
             model.setFlowCode(obj.getTaskStatusLabel());
-            model.setRoutePath(obj.getRoutePath() + urlParams);
             model.setTaskType("0");
             model.setFlowInstanceId(model.getRelationId());
             model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
             model.setTaskSource("workFlow");
             model.setExtras(JSON.toJSONString(obj.getModel()));
+            // model.setTerminal(params.getOrDefault("terminal","WEB").toString());
             model.setCreateDate(new Date());
             model.setRecUserId(RequestContext.getExeUserId());
             model.setAgencyCode(RequestContext.getAgencyCode());

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

@@ -110,8 +110,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
 
     @Transactional(rollbackFor = Exception.class)
     public void save2(String submitType, JSONObject requestParam) {
-        Map<String, JSONObject> jgRegistrationInfoMap = requestParam.entrySet().stream().
-                collect(Collectors.toMap(Map.Entry::getKey, entry -> (JSONObject) entry.getValue()));
+        Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>)JSONObject.parseObject(JSONObject.toJSONString(requestParam),Map.class);
         this.save(submitType, jgRegistrationInfoMap);
     }
 
@@ -194,6 +193,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     }
 
     private void createTaskModel(JgChangeRegistrationName dto, String taskName, String submitType) {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if ("1".equals(submitType)) {
             TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(dto.getApplyDate());
@@ -208,7 +208,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getAuditStatus()));
             taskModelDto.setTaskStatusLabel(dto.getAuditStatus());
             taskModelDto.setStartUserId(dto.getCreateUserId());
-            taskModelDto.setStartUser(dto.getCreateUserName());
+            taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
             taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
             taskModelDto.setStartDate(dto.getCreateDate());