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
2023-12-18 17:48:05 +08:00
parent 2dda03567a
commit fa1ad604ee
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+5 -3
View File
@@ -212,7 +212,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
default:
}
List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
Map<String, String> dictMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
Map<String, String> dictevaluationFeedbackMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
//给条款中保存关联的信息
if (!processProjectAssessTermUserList.isEmpty()) {
Map<String, List<ProcessProjectAssessTermUser>> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId);
@@ -222,7 +222,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
if (CollectionUtil.isNotEmpty(termUsers)){
for (ProcessProjectAssessTermUser termUser : termUsers) {
String evaluationFeedback = termUser.getEvaluationFeedback();
termUser.setEvaluationFeedback_dictText(dictMap.get(evaluationFeedback));
termUser.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
}
ProcessProjectAssessTermUser termUser = termUsers.get(0);
term.setEvaluationFeedback(termUser.getEvaluationFeedback());
@@ -238,6 +238,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
}
//拼接分类法规标题
List<DictModel> decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source");
Map<String, String> decompositionOrderSourceMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
Map<String, ProcessProjectAssessTerm> splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId);
List<ProcessProjectAssessTerm> allProjectAssesTermList = new ArrayList<>();
List<String> usedSplitInfoId = new ArrayList<>();
@@ -249,7 +251,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
ProcessProjectAssessTerm term1 = new ProcessProjectAssessTerm();
term1.setTermName(titleTerm.getTermName());
term1.setTermNumber(titleTerm.getTermNumber());
term1.setTermText(titleTerm.getTermText());
term1.setTermText(decompositionOrderSourceMap.get(titleTerm.getTermText()));
term1.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
allProjectAssesTermList.add(term1);
}