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

新增状态查询接口

Browse Source
This commit is contained in:
cdf
2024-06-05 16:07:47 +08:00
parent f8b45d44ab
commit 0939f20e4a
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
View File

@@ -198,6 +198,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
warningLeafletVOQueryWrapper.in("supervision_warning_leaflet.Create_By", colleaguesIds) warningLeafletVOQueryWrapper.in("supervision_warning_leaflet.Create_By", colleaguesIds)
.eq("supervision_warning_leaflet.state",DataStateEnum.ENABLE.getCode()) .eq("supervision_warning_leaflet.state",DataStateEnum.ENABLE.getCode())
.eq("supervision_warning_leaflet.leaflet_type", LeafletTypeEnum.ALARM.getCode()) .eq("supervision_warning_leaflet.leaflet_type", LeafletTypeEnum.ALARM.getCode())
.eq(Objects.nonNull(warningLeafletQueryParam.getStatus()),"supervision_warning_leaflet.status",warningLeafletQueryParam.getStatus())
.orderByDesc("supervision_warning_leaflet.Update_Time"); .orderByDesc("supervision_warning_leaflet.Update_Time");
Page<WarningLeafletVO> warningLeafletVOPage = this.baseMapper.alarmPageData(new Page<>(PageFactory.getPageNum(warningLeafletQueryParam), PageFactory.getPageSize(warningLeafletQueryParam)), warningLeafletVOQueryWrapper); Page<WarningLeafletVO> warningLeafletVOPage = this.baseMapper.alarmPageData(new Page<>(PageFactory.getPageNum(warningLeafletQueryParam), PageFactory.getPageSize(warningLeafletQueryParam)), warningLeafletVOQueryWrapper);
//目前仅知道现场测试超标会有附件 //目前仅知道现场测试超标会有附件

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

@@ -212,7 +212,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
lambdaQueryWrapper.orderByDesc(SupervisionPlanPO::getCreateTime); lambdaQueryWrapper.orderByDesc(SupervisionPlanPO::getCreateTime);
} }
// lambdaQueryWrapper.eq(Objects.nonNull(supvPlanParam.getStatus(),SupervisionPlanPO::getStatus,supvPlanParam.getStatus())); lambdaQueryWrapper.eq(Objects.nonNull(supvPlanParam.getStatus()),SupervisionPlanPO::getStatus,supvPlanParam.getStatus());
//获取当前用户部门所有同事的id，查看该部门下所有的数据 //获取当前用户部门所有同事的id，查看该部门下所有的数据
List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();

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

@@ -107,8 +107,9 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
} }
} }
if (Objects.nonNull(surveyTestQueryParam.getStatus())) { if (Objects.nonNull(surveyTestQueryParam.getStatus())) {
surveyTestVOQueryWrapper.in("supervision_survey_plan.status", surveyTestQueryParam.getStatus()); surveyTestVOQueryWrapper.eq("supervision_survey_test.status", surveyTestQueryParam.getStatus());
} }
} }