app养护计划明细提交

王富生
1 parent 1de76112
Showing 5 changed files with 32 additions and 31 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
@@ -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<Long> roleIds;
+    private Set<String> batchNos;
  
     @Schema(description = "业务线")
     @Hidden
@@ -17,7 +17,7 @@ import java.util.Set;
 public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam {
  
  
-    @Schema(description = "道路名称")
+    @Schema(description = "道路ID")
     @NotNull
     private Long roadId;
  
@@ -92,12 +92,10 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
     public List<AppInspectionPlanDetailRespVO> 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.明细*/
@@ -336,15 +336,13 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Override
     public PageResult<AppInspectionPlanRespVO> 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<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
-        pageReqVO.setRoleIds(roleIds);
+        Set<String> batchNos = getBatchNosByLoginUserId();
+        pageReqVO.setBatchNos(batchNos);
         pageReqVO.setLocalDate(LocalDate.now());
         /*2.分页*/
         IPage<AppInspectionPlanRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
@@ -374,4 +372,24 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         });
     }
  
+    /**
+     * 获取登录用户批次号List
+     */
+    private Set<String> getBatchNosByLoginUserId() {
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        Long deptId = SecurityFrameworkUtils.getDeptId();
+        /*1.查询登录用户角色*/
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        QueryWrapper<InspectionPlanRoleDO> roleSql = new QueryWrapper<>();
+        roleSql.select("batch_no");
+        roleSql.lambda().in(InspectionPlanRoleDO::getRoleId, roleIds).
+                eq(InspectionPlanRoleDO::getCompanyId, companyId)
+                .eq(InspectionPlanRoleDO::getDeptId, deptId);
+        List<InspectionPlanRoleDO> 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
@@ -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
           <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
           </if>
-        <if test="req.roleIds != null and req.roleIds.size() > 0">
-            AND b.role_id IN
-            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
+        <if test="req.batchNos != null and req.batchNos.size() > 0">
+            AND a.batch_no IN
+            <foreach collection="req.batchNos" item="batchNo" open="(" separator="," close=")">
+                #{batchNo}
             </foreach>
         </if>
         <if test="req.busiLineList != null and req.busiLineList.size() > 0">
@@ -57,13 +52,5 @@
             and a.finish_state = #{req.finishState}
             <![CDATA[and a.end_time >= #{req.localDate}]]>
         </if>
-        GROUP BY
-        a.batch_no,
-        a.road_id,
-        a.road_name,
-        a.plan_type_id,
-        a.level_id,
-        a.begin_time,
-        a.end_time
     </select>
 </mapper>
 \ No newline at end of file