Commit 67ce2001 authored by 韩桐桐's avatar 韩桐桐

fix(jg):使用登记,使用单位已经发起的单子撤回到使用单位时,进行修改保存操作,不在生成代办

parent 7fe2a693
...@@ -530,24 +530,26 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -530,24 +530,26 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId"))); flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")));
} }
} else { } else {
ArrayList<TaskModelDto> list = new ArrayList<>(); if (ObjectUtils.isEmpty(map.get("instanceId"))) {
TaskModelDto dto = new TaskModelDto(); ArrayList<TaskModelDto> list = new ArrayList<>();
TaskMessageDto taskMessageDto = new TaskMessageDto(); TaskModelDto dto = new TaskModelDto();
BeanUtil.copyProperties(jgUseRegistration, taskMessageDto); TaskMessageDto taskMessageDto = new TaskMessageDto();
taskMessageDto.setEquipId(String.valueOf(map.get("equipId"))); BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
// 数据参数 taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
dto.setModel(taskMessageDto); // 数据参数
// 摘要 dto.setModel(taskMessageDto);
dto.setTaskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号:" + jgUseRegistration.getApplyNo() + "】"); // 摘要
// 申请单号 dto.setTaskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号:" + jgUseRegistration.getApplyNo() + "】");
dto.setTaskCode(jgUseRegistration.getApplyNo()); // 申请单号
// 业务类型 dto.setTaskCode(jgUseRegistration.getApplyNo());
dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode())); // 业务类型
// 业务主键 dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode()));
dto.setRelationId(String.valueOf(jgUseRegistration.getSequenceNbr())); // 业务主键
dto.setNextExecuteUser(""); dto.setRelationId(String.valueOf(jgUseRegistration.getSequenceNbr()));
list.add(dto); dto.setNextExecuteUser("");
commonServiceImpl.buildTaskModel(list); list.add(dto);
commonServiceImpl.buildTaskModel(list);
}
} }
return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr()); return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
} catch (BadRequest | LocalBadRequest e) { } catch (BadRequest | LocalBadRequest e) {
......
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