diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java index ae7435e..208d7f6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java @@ -10,6 +10,7 @@ import lombok.Data; import java.time.LocalDate; import java.util.List; +import java.util.Set; @Schema(description = "App管理 - 巡检计划汇总新增/修改 Request VO") @Data @@ -24,13 +25,10 @@ public class AppInspectionPlanPageReqVO extends PageParam { @Max(value = 3, message = "状态不能大于4") private Integer finishState; - @Schema(description = "公司ID") - @Hidden - private Long companyId; - @Schema(description = "角色IDS") + @Schema(description = "批次号列表") @Hidden - private List roleIds; + private Set batchNos; @Schema(description = "业务线") @Hidden diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java index a278e87..930fd20 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java @@ -17,7 +17,7 @@ import java.util.Set; public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam { - @Schema(description = "道路名称") + @Schema(description = "道路ID") @NotNull private Long roadId; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java index 110af2b..1fe3235 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java @@ -92,12 +92,10 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ public List getInspectionPlanDetailForApp(AppInspectionPlanDetailReqVO pageReqVO) { String busiLine = SecurityFrameworkUtils.getBusiLine(); Long companyId = SecurityFrameworkUtils.getCompanyId(); - Long deptId = SecurityFrameworkUtils.getDeptId(); if (StringUtils.isNotEmpty(busiLine)) { pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); } pageReqVO.setCompanyId(companyId); - pageReqVO.setLocalDateTime(LocalDateTime.now()); /*2.明细*/ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java index b1ebf36..7c0421e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java @@ -336,15 +336,13 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { @Override public PageResult getInspectionPlanAppPage(AppInspectionPlanPageReqVO pageReqVO) { String busiLine = SecurityFrameworkUtils.getBusiLine(); - Long companyId = SecurityFrameworkUtils.getCompanyId(); if (StringUtils.isNotEmpty(busiLine)) { pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); } - pageReqVO.setCompanyId(companyId); /*1.查询登录用户角色*/ - List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); - pageReqVO.setRoleIds(roleIds); + Set batchNos = getBatchNosByLoginUserId(); + pageReqVO.setBatchNos(batchNos); pageReqVO.setLocalDate(LocalDate.now()); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); @@ -374,4 +372,24 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { }); } + /** + * 获取登录用户批次号List + */ + private Set getBatchNosByLoginUserId() { + Long companyId = SecurityFrameworkUtils.getCompanyId(); + Long deptId = SecurityFrameworkUtils.getDeptId(); + /*1.查询登录用户角色*/ + List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); + QueryWrapper roleSql = new QueryWrapper<>(); + roleSql.select("batch_no"); + roleSql.lambda().in(InspectionPlanRoleDO::getRoleId, roleIds). + eq(InspectionPlanRoleDO::getCompanyId, companyId) + .eq(InspectionPlanRoleDO::getDeptId, deptId); + List roleList = inspectionPlanRoleMapper.selectList(roleSql); + if (CollectionUtils.isEmpty(roleList)) { + return Collections.emptySet(); + } + return roleList.stream().map(InspectionPlanRoleDO::getBatchNo).collect(Collectors.toSet()); + } + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml index 2757b18..a439c56 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml @@ -24,20 +24,15 @@ a.begin_time, a.end_time FROM - garden_inspection_plan a, - garden_inspection_plan_role b - WHERE - a.batch_no = b.batch_no - AND a.dept_id =b.dept_id - AND a.deleted=0 - AND a.company_id = #{req.companyId} + garden_inspection_plan a + WHERE a.deleted=0 AND a.road_name LIKE CONCAT('%',#{req.roadName},'%') - - AND b.role_id IN - - #{roleId} + + AND a.batch_no IN + + #{batchNo} @@ -57,13 +52,5 @@ and a.finish_state = #{req.finishState} = #{req.localDate}]]> - GROUP BY - a.batch_no, - a.road_id, - a.road_name, - a.plan_type_id, - a.level_id, - a.begin_time, - a.end_time \ No newline at end of file