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

fix 81363 法规合规评估流程-部所主管级领导审批修改是否立项，法规工程师审批节点依然回显默认值

Browse Source
This commit is contained in:
lijiarao
2024-02-01 17:04:17 +08:00
parent 65651622f8
commit 2340fd2610
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
+7
View File
@@ -132,6 +132,13 @@ public class ProcessProjectStandardTerm {
@ApiModelProperty(value="是否立项")
private String projectApprovalFlag;
/**
* 是否立项
*/
@TableField(exist = false)
@ApiModelProperty(value="是否立项")
private String projectApprovalFlag_dictText;
/**
* 设计工程师
*/
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+19 -4
View File
@@ -133,6 +133,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
}
List<ProcessProjectStandardTermUser> processProjectStandardTermUserList = new ArrayList<>();
List<ProcessProjectStandardTerm> processProjectStandardTermList = new ArrayList<>();
List<ProcessProjectStandardTermApproval> approvalList1 = new ArrayList<>();
//获取所有用户信息
List<LoginUser> userList = sysBaseAPI.getAllUser();
Map<String, String> userNameMap = new HashMap<>();
@@ -181,6 +182,9 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
case ProcessProjectStandardCommon.FGGCSSP:
processProjectStandardTermList = termMapper.getByStandardsEngineer(processId);
termUserList = termUserService.list(wrapper);
LambdaQueryWrapper<ProcessProjectStandardTermApproval> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(ProcessProjectStandardTermApproval::getProcessId,processId);
approvalList1 = termApprovalService.list(wrapper1);
break;
//设计工程师补充工作令编号
case ProcessProjectStandardCommon.SJGCSBCGZLBH:
@@ -195,6 +199,8 @@ 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<ProcessProjectStandardTermApproval>> termIdApprovalListMap = CollStreamUtil.groupByKey(approvalList1, ProcessProjectStandardTermApproval::getTermId);
//给条款中保存关联的信息
Map<String, List<ProcessProjectStandardTermUser>> termIdListMap = CollStreamUtil.groupByKey(termUserList, ProcessProjectStandardTermUser::getTermId);
for (ProcessProjectStandardTerm term : processProjectStandardTermList) {
@@ -243,12 +249,23 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
}
term.setAssessResults_dictText(assessResultsMap.get(assessResults));
String projectApprovalFlag;
if (AssessCommon.NOT_COMPLIANT.equals(assessResults)) {
if (ProcessProjectStandardCommon.FGGCSSP.equals(taskDefinitionKey)){
projectApprovalFlag = YesOrNoEnum.NO.getValue();
List<ProcessProjectStandardTermApproval> termApprovalList = termIdApprovalListMap.get(termId);
for (ProcessProjectStandardTermApproval termApproval : termApprovalList) {
String projectApprovalFlag1 = termApproval.getProjectApprovalFlag();
if (YesOrNoEnum.YES.getValue().equals(projectApprovalFlag1)){
projectApprovalFlag = YesOrNoEnum.YES.getValue();
break;
}
}
}else if (AssessCommon.NOT_COMPLIANT.equals(assessResults)) {
projectApprovalFlag = YesOrNoEnum.YES.getValue();
}else {
projectApprovalFlag = YesOrNoEnum.NO.getValue();
}
term.setProjectApprovalFlag(projectApprovalFlag);
term.setProjectApprovalFlag_dictText(YesOrNoEnum.getNameByValue(projectApprovalFlag));
String modelSeries = term.getModelSeries();
term.setModelSeries_dictText(sysBaseAPI.translateByDictMap(modelSeriesDictMap,modelSeries));
@@ -270,9 +287,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
processProjectStandardVO.setProcessProjectStandardTermList(processProjectStandardTermList);
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);
List<ProcessProjectStandardTermApproval> approvalList = termIdApprovalListMap.get(termId);
for (ProcessProjectStandardTermApproval termApproval : approvalList) {
String responsibleUnitLeader = termApproval.getResponsibleUnitLeader();
termApproval.setResponsibleUnitLeader(userNameMap.get(responsibleUnitLeader));