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-19 09:07:06 +08:00
parent d75aed3e01
commit 64fb127eac
2 changed files with 2 additions and 2 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
+1 -1
View File
@@ -240,7 +240,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
} }
//拼接分类法规标题 //拼接分类法规标题
List<DictModel> decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source"); List<DictModel> decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source");
Map<String, String> decompositionOrderSourceMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); Map<String, String> decompositionOrderSourceMap = CollStreamUtil.toMap(decompositionOrderSourceDictModels, DictModel::getValue, DictModel::getText);
Map<String, ProcessProjectAssessTerm> splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId); Map<String, ProcessProjectAssessTerm> splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId);
List<ProcessProjectAssessTerm> allProjectAssesTermList = new ArrayList<>(); List<ProcessProjectAssessTerm> allProjectAssesTermList = new ArrayList<>();
List<String> usedSplitInfoId = new ArrayList<>(); List<String> usedSplitInfoId = new ArrayList<>();
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class ProcessProjectAssessTermService extends ServiceImpl<ProcessProjectA
public List<ProcessProjectAssessTerm> getByStandardsEngineer(String assessmentId) { public List<ProcessProjectAssessTerm> getByStandardsEngineer(String assessmentId) {
LambdaQueryWrapper<ProcessProjectAssessTerm> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProcessProjectAssessTerm> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId); wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId);
//wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger()); wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger());
List<ProcessProjectAssessTerm> list = this.list(wrapper); List<ProcessProjectAssessTerm> list = this.list(wrapper);
return list; return list;
} }