Commit 87b7aa6b authored by zhangsen's avatar zhangsen

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

parents c6bb3828 cce41013
...@@ -110,8 +110,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg ...@@ -110,8 +110,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void save2(String submitType, JSONObject requestParam) { public void save2(String submitType, JSONObject requestParam) {
Map<String, JSONObject> jgRegistrationInfoMap = requestParam.entrySet().stream(). Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>)JSONObject.parseObject(JSONObject.toJSONString(requestParam),Map.class);
collect(Collectors.toMap(Map.Entry::getKey, entry -> (JSONObject) entry.getValue()));
this.save(submitType, jgRegistrationInfoMap); this.save(submitType, jgRegistrationInfoMap);
} }
...@@ -194,6 +193,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg ...@@ -194,6 +193,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
} }
private void createTaskModel(JgChangeRegistrationName dto, String taskName, String submitType) { 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)) { if ("1".equals(submitType)) {
TaskModelDto taskModelDto = new TaskModelDto(); TaskModelDto taskModelDto = new TaskModelDto();
taskModelDto.setFlowCreateDate(dto.getApplyDate()); taskModelDto.setFlowCreateDate(dto.getApplyDate());
...@@ -208,7 +208,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg ...@@ -208,7 +208,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getAuditStatus())); taskModelDto.setTaskStatus(this.getTaskCodeByName(dto.getAuditStatus()));
taskModelDto.setTaskStatusLabel(dto.getAuditStatus()); taskModelDto.setTaskStatusLabel(dto.getAuditStatus());
taskModelDto.setStartUserId(dto.getCreateUserId()); taskModelDto.setStartUserId(dto.getCreateUserId());
taskModelDto.setStartUser(dto.getCreateUserName()); taskModelDto.setStartUser(reginParams.getUserModel().getRealName());
taskModelDto.setStartUserCompanyName(dto.getUseUnitName()); taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
taskModelDto.setNextExecuteUser(dto.getNextExecutorIds()); taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
taskModelDto.setStartDate(dto.getCreateDate()); taskModelDto.setStartDate(dto.getCreateDate());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment