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

微调

Browse Source
This commit is contained in:
hongawen
2024-09-25 09:03:03 +08:00
parent dcfcf3ece2
commit 0441720fcd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,13 +433,13 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
return todoVOList; return todoVOList;
} }
queryWrapper.in("supervision_survey_test.dept_id", deptIds) queryWrapper.in("supervision_survey_test.dept_id", deptIds)
.le("supervision_survey_plan.plan_start_time", LocalDateTimeUtil.now())
.eq("supervision_survey_test.state", DataStateEnum.ENABLE.getCode()) .eq("supervision_survey_test.state", DataStateEnum.ENABLE.getCode())
.eq("supervision_survey_test.status", BpmProcessInstanceStatusEnum.AWAIT.getStatus()) .eq("supervision_survey_test.status", BpmProcessInstanceStatusEnum.AWAIT.getStatus())
.orderByDesc("supervision_survey_test.Update_Time"); .orderByDesc("supervision_survey_test.Update_Time");
List<SurveyTestVO> surveyTestVOList = this.baseMapper.getTodoBusiness(queryWrapper); List<SurveyTestVO> surveyTestVOList = this.baseMapper.getTodoBusiness(queryWrapper);
if(CollectionUtil.isNotEmpty(surveyTestVOList)){ if(CollectionUtil.isNotEmpty(surveyTestVOList)){
todoVOList = surveyTestVOList.stream().map(item -> { todoVOList = surveyTestVOList.stream().map(item -> {
if (item.getCustomSubstationFlag() == 0) { if (item.getCustomSubstationFlag() == 0) {
//关联台账内的变电站名称 //关联台账内的变电站名称
String substation = item.getSubstation(); String substation = item.getSubstation();