This commit is contained in:
2024-09-25 09:03:03 +08:00
parent dcfcf3ece2
commit 0441720fcd

View File

@@ -433,13 +433,13 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
return todoVOList;
}
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.status", BpmProcessInstanceStatusEnum.AWAIT.getStatus())
.orderByDesc("supervision_survey_test.Update_Time");
List<SurveyTestVO> surveyTestVOList = this.baseMapper.getTodoBusiness(queryWrapper);
if(CollectionUtil.isNotEmpty(surveyTestVOList)){
todoVOList = surveyTestVOList.stream().map(item -> {
if (item.getCustomSubstationFlag() == 0) {
//关联台账内的变电站名称
String substation = item.getSubstation();