Commit 95d2b592 authored by lisong's avatar lisong

添加字段

parent c6e8a7ce
......@@ -180,4 +180,7 @@ public class JgUseRegistration extends BaseEntity {
@TableField(exist = false)
private String equipId;
@TableField(value = "next_execute_user_ids")
private String nextExecuteUserIds;
}
......@@ -28,7 +28,8 @@
ur.supervisory_code as supervisoryCode,
ur.use_registration_code as useRegistrationCode,
date_format(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
ur.receive_org_name as receiveOrgName
ur.receive_org_name as receiveOrgName,
ur.next_execute_user_ids as nextExecuteUserIds
from tzs_jg_use_registration ur
LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
......
......@@ -254,6 +254,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
jgUseRegistration.setEquipId(jgUseRegistrationEq.getEquId());
jgUseRegistration.setNextTaskId(workflowResultDto.getNextTaskId());
jgUseRegistration.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
if (isFirst) {
jgUseRegistration.setInstanceStatus(workflowResultDto.getExecutorRoleIds());
jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
......@@ -423,6 +424,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
} else {
// 流程结束
jgUseRegistration.setStatus(taskCode);
jgUseRegistration.setNextExecuteUserIds(null);
if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
// 生成使用登记证编号
jgUseRegistration.setUseRegistrationCode(getCode(jgUseRegistration.getSupervisoryCode()));
......@@ -472,6 +474,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
taskCode = resultDto.get(0).getNextTaskCode();
roles = resultDto.get(0).getNextExecutorRoleIds();
jgUseRegistration.setNextTaskId(resultDto.get(0).getNextTaskId());
jgUseRegistration.setNextExecuteUserIds(resultDto.get(0).getNextExecutorUserIds());
}
LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
lambda.eq(JgUseRegistration::getInstanceId, instanceId);
......
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