ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 法规合规评估流程 法规工程师查询详情

Browse Source
This commit is contained in:
lijiarao
2024-01-19 16:49:19 +08:00
parent 024f3395c6
commit b2d6fc2232
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
-5
View File
@@ -107,11 +107,6 @@
<select id="getByStandardsEngineer" resultMap="BaseResultMap">
select
ppstu.id term_user_id,
ppstu.not_involved,
ppstu.assess_results,
ppstu.description,
ppstu.file_id,
ppstu.design_engineer
<include refid="Base_Column_List">
<property name="alias" value="ppst"/>
</include>
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+21 -6
View File
@@ -146,7 +146,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
//发起人
LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectStandardTermUser::getProcessId, processId);
List<ProcessProjectStandardTermUser> list = new ArrayList<>();
List<ProcessProjectStandardTermUser> termUserList = new ArrayList<>();
switch (taskDefinitionKey) {
//部所主管级领导下发
case ProcessProjectStandardCommon.BSZGJLDXF:
@@ -170,18 +170,18 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
processProjectStandardTermList = termMapper.getByModuleOwner(processId, originUserId, executionParentId, false);
wrapper.eq(ProcessProjectStandardTermUser::getModuleOwner, originUserId);
wrapper.eq(ProcessProjectStandardTermUser::getParentExecutionId, executionParentId);
list = termUserService.list(wrapper);
termUserList = termUserService.list(wrapper);
break;
//部所主管级领导审批
case ProcessProjectStandardCommon.BSZGJLDSP_:
processProjectStandardTermList = termMapper.getByResponsibleUnitLeader(processId, originUserId, true);
wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader, originUserId);
list = termUserService.list(wrapper);
termUserList = termUserService.list(wrapper);
break;
//法规工程师审批
case ProcessProjectStandardCommon.FGGCSSP:
processProjectStandardTermList = termMapper.getByStandardsEngineer(processId);
list = termUserService.list(wrapper);
termUserList = termUserService.list(wrapper);
break;
//设计工程师补充工作令编号
case ProcessProjectStandardCommon.SJGCSBCGZLBH:
@@ -197,7 +197,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
Map<String, String> assessResultsMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
//给条款中保存关联的信息
Map<String, List<ProcessProjectStandardTermUser>> termIdListMap = CollStreamUtil.groupByKey(list, ProcessProjectStandardTermUser::getTermId);
Map<String, List<ProcessProjectStandardTermUser>> termIdListMap = CollStreamUtil.groupByKey(termUserList, ProcessProjectStandardTermUser::getTermId);
for (ProcessProjectStandardTerm term : processProjectStandardTermList) {
String termId = term.getId();
if (termIdListMap.containsKey(termId)) {
@@ -261,7 +261,22 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
processProjectStandardVO.setModuleOwner(moduleOwner1);
processProjectStandardVO.setProcessProjectStandard(processProjectStandard);
processProjectStandardVO.setProcessProjectStandardTermList(processProjectStandardTermList);
//processProjectStandardVO.setProcessProjectStandardTermUserList();
if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){
String termId = processProjectStandardTermList.get(0).getId();
LambdaQueryWrapper<ProcessProjectStandardTermApproval> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(ProcessProjectStandardTermApproval::getTermId,termId);
List<ProcessProjectStandardTermApproval> approvalList = termApprovalService.list(wrapper1);
for (ProcessProjectStandardTermApproval termApproval : approvalList) {
String responsibleUnitLeader = termApproval.getResponsibleUnitLeader();
termApproval.setResponsibleUnitLeader(userNameMap.get(responsibleUnitLeader));
String assessResults = termApproval.getAssessResults();
termApproval.setAssessResults(assessResultsMap.get(assessResults));
String projectApprovalFlag = termApproval.getProjectApprovalFlag();
termApproval.setProjectApprovalFlag(YesOrNoEnum.YES.getValue().equals(projectApprovalFlag)?YesOrNoEnum.YES.getName():YesOrNoEnum.NO.getName());
}
processProjectStandardVO.setProcessProjectStandardTermApprovalList(approvalList);
}
processInfoVO.setBusinessInfoDTO(processProjectStandardVO);
return processInfoVO;
}