diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java index e1e2deb1b..5910e9258 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java @@ -116,6 +116,11 @@ public class WarningLeafletParam implements Serializable{ @EqualsAndHashCode(callSuper = true) public static class WarningLeafletQueryParam extends BaseParam { + /** + * 负责单位 + */ + String deptIndex; + /** * 1:审批中；2：审批通过；3：审批不通过；4：已取消；5：待反馈 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java index 1aa4ac0fb..73e9b9ffb 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java @@ -89,6 +89,10 @@ public class SupervisionUserComplaintParam { @EqualsAndHashCode(callSuper = true) public static class SupervisionUserComplaintQueryParam extends BaseParam { + /** + * 负责单位 + */ + String deptIndex; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java index a4859fc38..fc84ad07a 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java @@ -103,6 +103,12 @@ public class SurveyTestParam implements Serializable { @EqualsAndHashCode(callSuper = true) public static class SurveyTestQueryParam extends BaseParam { + + /** + * 普测负责单位 + */ + String deptIndex; + /** * 普测负责单位 */ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index 956280755..f1cafa563 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -137,13 +137,23 @@ public class UserReportManageController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getNormalUserPage") + @ApiOperation("分页查询常态化干扰源用户台账") + @ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true) + public HttpResult> getNormalUserPage(@RequestBody @Validated UserReportParam.UserReportQueryParam userReportQueryParam) { + String methodDescribe = getMethodDescribe("getInterferenceUserPage"); + Page out = userReportPOService.getInterferenceUserPage(userReportQueryParam,true); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getInterferenceUserPage") @ApiOperation("分页查询干扰源用户台账") @ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true) public HttpResult> getInterferenceUserPage(@RequestBody @Validated UserReportParam.UserReportQueryParam userReportQueryParam) { String methodDescribe = getMethodDescribe("getInterferenceUserPage"); - Page out = userReportPOService.getInterferenceUserPage(userReportQueryParam); + Page out = userReportPOService.getInterferenceUserPage(userReportQueryParam,false); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java index 24760e0d1..c56c0e597 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java @@ -149,11 +149,8 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl page =this.baseMapper.pageHasDebug(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper); - return page; } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java index e2e62f6f4..4ed64dc56 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java @@ -111,9 +111,13 @@ public class WarningLeafletServiceImpl extends ServiceImpl colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - warningLeafletVOQueryWrapper.in("supervision_warning_leaflet.Create_By", colleaguesIds) + + //筛选负责单位 + if (StrUtil.isNotBlank(warningLeafletQueryParam.getDeptIndex())) { + List deptIds = deptFeignClient.getDepSonIdtByDeptId(warningLeafletQueryParam.getDeptIndex()).getData(); + warningLeafletVOQueryWrapper.in("supervision_warning_leaflet.dept_id", deptIds); + } + warningLeafletVOQueryWrapper .eq("supervision_warning_leaflet.state", DataStateEnum.ENABLE.getCode()) .eq("supervision_warning_leaflet.leaflet_type", LeafletTypeEnum.WARNING.getCode()) .orderByDesc("supervision_warning_leaflet.Update_Time"); @@ -242,9 +246,13 @@ public class WarningLeafletServiceImpl extends ServiceImpl colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - warningLeafletVOQueryWrapper.in("supervision_warning_leaflet.Create_By", colleaguesIds) + + //筛选负责单位 + if (StrUtil.isNotBlank(warningLeafletQueryParam.getDeptIndex())) { + List deptIds = deptFeignClient.getDepSonIdtByDeptId(warningLeafletQueryParam.getDeptIndex()).getData(); + warningLeafletVOQueryWrapper.in("supervision_warning_leaflet.dept_id", deptIds); + } + warningLeafletVOQueryWrapper .eq("supervision_warning_leaflet.state", DataStateEnum.ENABLE.getCode()) .eq("supervision_warning_leaflet.leaflet_type", LeafletTypeEnum.ALARM.getCode()) .eq(Objects.nonNull(warningLeafletQueryParam.getStatus()), "supervision_warning_leaflet.status", warningLeafletQueryParam.getStatus()) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java index 26301e32b..82c8a7a3b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -28,6 +29,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.List; import java.util.Map; import java.util.Objects; @@ -70,9 +72,13 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - supervisionUserComplaintQueryWrapper.in("supervision_user_complaint.Create_By", colleaguesIds) + //筛选普测负责单位 + if (StrUtil.isNotBlank(supervisionUserComplaintQueryParam.getDeptIndex())) { + List deptIds = deptFeignClient.getDepSonIdtByDeptId(supervisionUserComplaintQueryParam.getDeptIndex()).getData(); + supervisionUserComplaintQueryWrapper.in("supervision_user_complaint.duty_Org_Id", deptIds); + } + + supervisionUserComplaintQueryWrapper .eq("supervision_user_complaint.state",DataStateEnum.ENABLE.getCode()) .orderByDesc("supervision_user_complaint.Update_Time"); Page page = this.baseMapper.getPage(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index 326355b02..a8e7a7216 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -90,16 +90,12 @@ public class SurveyPlanServiceImpl extends ServiceImpl deptIds = deptFeignClient.getDepSonIdtByDeptId(surveyPlanQueryParam.getDeptIndex()).getData(); surveyPlanVOQueryWrapper.in("supervision_survey_plan.dept_id", deptIds); } - if (Objects.nonNull(surveyPlanQueryParam.getStatus())) { surveyPlanVOQueryWrapper.in("supervision_survey_plan.status", surveyPlanQueryParam.getStatus()); } surveyPlanVOQueryWrapper.eq(StringUtils.isNotBlank(surveyPlanQueryParam.getSupvType()),"supervision_survey_plan.supv_type",surveyPlanQueryParam.getSupvType()); } - //获取当前用户部门所有同事的id，查看该部门下所有的数据 - List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - surveyPlanVOQueryWrapper.in("supervision_survey_plan.Create_By", colleaguesIds) - .eq("supervision_survey_plan.state", DataStateEnum.ENABLE.getCode()) + surveyPlanVOQueryWrapper.eq("supervision_survey_plan.state", DataStateEnum.ENABLE.getCode()) .orderByDesc("supervision_survey_plan.Update_Time"); Page surveyPlanVOPage = this.baseMapper.surveyPlanPage(new Page<>(PageFactory.getPageNum(surveyPlanQueryParam), PageFactory.getPageSize(surveyPlanQueryParam)), surveyPlanVOQueryWrapper); List records = surveyPlanVOPage.getRecords(); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java index 2f5d91fd6..435ca9501 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java @@ -117,8 +117,7 @@ public class SurveyTestServiceImpl extends ServiceImpl colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - surveyTestVOQueryWrapper.in("supervision_survey_test.Create_By", colleaguesIds) + surveyTestVOQueryWrapper .eq("supervision_survey_test.state", DataStateEnum.ENABLE.getCode()) .orderByDesc("supervision_survey_test.Update_Time"); Page surveyTestVOPage = this.baseMapper.surveyTestPage(new Page<>(PageFactory.getPageNum(surveyTestQueryParam), PageFactory.getPageSize(surveyTestQueryParam)), surveyTestVOQueryWrapper); @@ -162,10 +161,13 @@ public class SurveyTestServiceImpl extends ServiceImpl(); } } + //筛选普测负责单位 + if (StrUtil.isNotBlank(surveyTestQueryParam.getDeptIndex())) { + List deptIds = deptFeignClient.getDepSonIdtByDeptId(surveyTestQueryParam.getDeptIndex()).getData(); + surveyTestVOQueryWrapper.in("supervision_survey_test.dept_id", deptIds); + } } - //获取当前用户部门所有同事的id，查看该部门下所有的数据 - List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - surveyTestVOQueryWrapper.in("supervision_survey_test.Create_By", colleaguesIds) + surveyTestVOQueryWrapper .eq("supervision_survey_test.problem_flag", 1) .eq("supervision_survey_test.status", FlowStatusEnum.APPROVE.getCode()) .eq("supervision_survey_test.state", DataStateEnum.ENABLE.getCode()) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java index 3646ba0c3..5498d2de3 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java @@ -36,7 +36,7 @@ public interface UserReportPOService extends IBpmService { List getUserReportList(); - Page getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam); + Page getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam,Boolean allDataFlag); String cancelUserReport(BpmProcessInstanceCancelParam cancelReqVO); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 67d704550..51d0f4bf9 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -389,14 +389,16 @@ public class UserReportPOServiceImpl extends ServiceImpl getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam) { + public Page getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam,Boolean allDataFlag) { QueryWrapper userReportVOQueryWrapper = new QueryWrapper<>(); List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - //此处不查询敏感及重要用户 userReportVOQueryWrapper.in("supervision_user_report.create_by", colleaguesIds) .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()) - .ne("supervision_user_report.user_type", UserNatureEnum.SENSITIVE_USER.getCode()) .eq("supervision_user_report.status", FlowStatusEnum.APPROVE.getCode()); + if(!allDataFlag){ + //台账不查询全部数据，需要排除敏感及重要用户 + userReportVOQueryWrapper.ne("supervision_user_report.user_type", UserNatureEnum.SENSITIVE_USER.getCode()); + } if (Objects.nonNull(userReportQueryParam)) { if (StrUtil.isNotBlank(userReportQueryParam.getCity())) { //查询所有区域下的数据