fix 81474 法规合规评估流程-部所主管级领导审批节点-查看 模块负责人没有正常回显
This commit is contained in:
@@ -71,6 +71,21 @@ where process_definition_id like 'project-assessment:%';
|
|||||||
|
|
||||||
# 未符合项跟踪流程开始
|
# 未符合项跟踪流程开始
|
||||||
|
|
||||||
|
update process_node
|
||||||
|
set can_choose = 0
|
||||||
|
where process_definition_id like 'project-not-met:%'
|
||||||
|
and xml_node_id in ('fggcsfqzg','fggcssp')
|
||||||
|
;
|
||||||
|
update process_node
|
||||||
|
set sort = case
|
||||||
|
when xml_node_id = 'fggcsfqzg' then '1'
|
||||||
|
when xml_node_id = 'sjgcssczgcl' then '2'
|
||||||
|
when xml_node_id = 'zgjldsp' then '3'
|
||||||
|
when xml_node_id = 'fggcssp' then '4'
|
||||||
|
end
|
||||||
|
where process_definition_id like 'project-not-met:%'
|
||||||
|
;
|
||||||
|
|
||||||
# 未符合项跟踪流程结束
|
# 未符合项跟踪流程结束
|
||||||
|
|
||||||
# 法规合规评估流程开始
|
# 法规合规评估流程开始
|
||||||
|
|||||||
+1
@@ -90,6 +90,7 @@ public class ProcessProjectStandardTermUser {
|
|||||||
* 责任单位负责人id
|
* 责任单位负责人id
|
||||||
*/
|
*/
|
||||||
@TableField(value = "responsible_unit_leader")
|
@TableField(value = "responsible_unit_leader")
|
||||||
|
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||||
@ApiModelProperty(value="责任单位负责人id")
|
@ApiModelProperty(value="责任单位负责人id")
|
||||||
private String responsibleUnitLeader;
|
private String responsibleUnitLeader;
|
||||||
|
|
||||||
|
|||||||
+7
-4
@@ -940,12 +940,15 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
|
|||||||
}
|
}
|
||||||
|
|
||||||
public IPage<ProcessProjectStandardTermUser> getTermUserList(ProcessProjectStandardTermUser termUser, Integer pageNo, Integer pageSize) {
|
public IPage<ProcessProjectStandardTermUser> getTermUserList(ProcessProjectStandardTermUser termUser, Integer pageNo, Integer pageSize) {
|
||||||
|
String taskId = termUser.getTaskId();
|
||||||
|
if (taskId != null){
|
||||||
|
ProcessDTO processDTO = processHandleService.getProcessDTO(taskId);
|
||||||
|
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
|
||||||
|
String originUserId = processApprovalRecord.getOriginUserId();
|
||||||
|
termUser.setResponsibleUnitLeader(originUserId);
|
||||||
|
}
|
||||||
Page<ProcessProjectStandardTermUser> page = new Page<>(pageNo, pageSize);
|
Page<ProcessProjectStandardTermUser> page = new Page<>(pageNo, pageSize);
|
||||||
Page<ProcessProjectStandardTermUser> pageList = termUserMapper.selectPageByUser(page, termUser);
|
Page<ProcessProjectStandardTermUser> pageList = termUserMapper.selectPageByUser(page, termUser);
|
||||||
for (ProcessProjectStandardTermUser record : pageList.getRecords()) {
|
|
||||||
String moduleOwner = record.getModuleOwner();
|
|
||||||
record.setModuleOwner(sysBaseAPI.translateUserRealNameFromTable(moduleOwner));
|
|
||||||
}
|
|
||||||
return pageList;
|
return pageList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user