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

fix 80084 项目合规评估流程-多人提交相同的数据在这个页面生成多条，但按照条款走流程，上面进行提示的标准只展示了一次

Browse Source
This commit is contained in:
lijiarao
2024-02-04 10:57:48 +08:00
parent d489ac6cf0
commit 267bf376e0
1 changed files with 12 additions and 0 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
+12
View File
@@ -284,7 +284,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
Map<String, ProcessProjectAssessTerm> splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId);
List<ProcessProjectAssessTerm> allProjectAssesTermList = new ArrayList<>();
List<String> usedSplitInfoId = new ArrayList<>();
String previousAssessorId = null;
for (ProcessProjectAssessTerm term : processProjectAssessTermList) {
String assessorId = term.getAssessorId();
String splitInfoId = term.getSplitInfoId();
if (!usedSplitInfoId.contains(splitInfoId) && splitInfoIdMap.containsKey(splitInfoId)) {
usedSplitInfoId.add(splitInfoId);
@@ -296,7 +298,17 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
term1.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
term1.setPromoter(createUserName);
allProjectAssesTermList.add(term1);
}else if (usedSplitInfoId.contains(splitInfoId) && splitInfoIdMap.containsKey(splitInfoId) && !Objects.equals(previousAssessorId,assessorId)){
ProcessProjectAssessTerm titleTerm = splitInfoIdMap.get(splitInfoId);
ProcessProjectAssessTerm term1 = new ProcessProjectAssessTerm();
term1.setTermName(titleTerm.getTermName());
term1.setTermNumber(titleTerm.getTermNumber());
term1.setTermText(decompositionOrderSourceMap.get(titleTerm.getTermText()));
term1.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
term1.setPromoter(createUserName);
allProjectAssesTermList.add(term1);
}
previousAssessorId = assessorId;
allProjectAssesTermList.add(term);
}
ProcessProjectAssess projectAssess = this.getById(assessmentId);