Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修复普测调整带来的其他功能bug

Browse Source
This commit is contained in:
hongawen
2024-06-04 15:02:46 +08:00
parent 06ec23710d
commit 503a82e92a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
View File

@@ -93,7 +93,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())), DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime()))); DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime())));
//根据工程名称模糊搜索 //根据工程名称模糊搜索
if (StrUtil.isNotBlank(surveyTestQueryParam.getSearchValue())) { if (Objects.nonNull(surveyTestQueryParam.getSearchValue())) {
LambdaQueryWrapper<SurveyPlan> surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SurveyPlan> surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>();
surveyPlanLambdaQueryWrapper.eq(SurveyPlan::getState, DataStateEnum.ENABLE.getCode()) surveyPlanLambdaQueryWrapper.eq(SurveyPlan::getState, DataStateEnum.ENABLE.getCode())
.like(SurveyPlan::getPlanName, surveyTestQueryParam.getSearchValue()); .like(SurveyPlan::getPlanName, surveyTestQueryParam.getSearchValue());
@@ -101,10 +101,10 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
if (CollectionUtil.isNotEmpty(surveyPlans)) { if (CollectionUtil.isNotEmpty(surveyPlans)) {
List<String> planIds = surveyPlans.stream().map(SurveyPlan::getId).collect(Collectors.toList()); List<String> planIds = surveyPlans.stream().map(SurveyPlan::getId).collect(Collectors.toList());
surveyTestVOQueryWrapper.in("supervision_survey_test.plan_id", planIds); surveyTestVOQueryWrapper.in("supervision_survey_test.plan_id", planIds);
}else {
//没有匹配的。直接返回
return new Page<>();
} }
} else {
//没有匹配的。直接返回
return new Page<>();
} }
} }
//获取当前用户部门所有同事的id，查看该部门下所有的数据 //获取当前用户部门所有同事的id，查看该部门下所有的数据