WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
wangzhijiang
2022-08-17 13:38:44 +08:00
parent aecb7df88e
commit 92f959ccd8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java
+8 -2
View File
@@ -98,6 +98,12 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAsses
QueryWrapper<ConditionAssessmentEO> queryWrapper = new QueryWrapper<>(); QueryWrapper<ConditionAssessmentEO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId);
List<ConditionAssessmentEO> conditionAssessmentEOS = super.baseMapper.selectList(queryWrapper); List<ConditionAssessmentEO> conditionAssessmentEOS = super.baseMapper.selectList(queryWrapper);
if(CollectionUtils.isNotEmpty(conditionAssessmentEOS)){
//根据角色编码去重。
conditionAssessmentEOS = conditionAssessmentEOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(o -> o.getRoleCode()))),
ArrayList::new));
}
return conditionAssessmentEOS; return conditionAssessmentEOS;
} }
@@ -150,9 +156,9 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAsses
QueryWrapper<ConditionAssessmentEO> queryWrapper = new QueryWrapper<>(); QueryWrapper<ConditionAssessmentEO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId);
if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){ /*if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){
queryWrapper.lambda().eq(ConditionAssessmentEO::getConditionAssessment,projectTaskInventory.getProjectStatusAssess()); queryWrapper.lambda().eq(ConditionAssessmentEO::getConditionAssessment,projectTaskInventory.getProjectStatusAssess());
} }*/
if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
queryWrapper.lambda().eq(ConditionAssessmentEO::getCreateBy,currentUser.getUsername()); queryWrapper.lambda().eq(ConditionAssessmentEO::getCreateBy,currentUser.getUsername());