app巡查汇总查询提交

王富生
1 parent 479351f5
Showing 12 changed files with 265 additions and 20 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanDetailController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailRespVO.java
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/inspectionplan/vo/AppInspectionPlanRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailService.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/InspectionPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
@@ -2,7 +2,6 @@ package com.zteits.urbanops.module.garden.controller.app.inspectionplan;
  
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanRespVO;
 import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanPageReqVO;
 import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO;
 import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanService;
@@ -11,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
@@ -29,7 +27,7 @@ public class AppInspectionPlanController {
  
     @GetMapping("/page")
     @Operation(summary = "app-巡检计划汇总分页")
-    @PreAuthorize("@ss.hasPermission('app:garden:inspection-plan:query')")
+    //@PreAuthorize("@ss.hasPermission('app:garden:inspection-plan:query')")
     public CommonResult<PageResult<AppInspectionPlanRespVO>> getInspectionPlanAppPage(@Valid AppInspectionPlanPageReqVO pageReqVO) {
         PageResult<AppInspectionPlanRespVO> pageResult = inspectionPlanService.getInspectionPlanAppPage(pageReqVO);
         return success(pageResult);
 package com.zteits.urbanops.module.garden.controller.app.inspectionplan;
  
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailReqVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO;
 import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanDetailService;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
  
+import java.util.List;
+
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
  
 @Tag(name = "APP管理 - 巡检计划")
 @RestController
@@ -18,5 +31,13 @@ public class AppInspectionPlanDetailController {
     private InspectionPlanDetailService inspectionPlanDetailService;
  
  
+    @PostMapping("/get-details")
+    @Operation(summary = "app-巡检计划明细")
+    //@PreAuthorize("@ss.hasPermission('app:garden:inspection-plan-detail:query')")
+    public CommonResult<List<AppInspectionPlanDetailRespVO>> getInspectionPlanDetailAppPage(@Valid @RequestBody AppInspectionPlanDetailReqVO pageReqVO) {
+        List<AppInspectionPlanDetailRespVO> pageResult = inspectionPlanDetailService.getInspectionPlanDetailForApp(pageReqVO);
+        return success(pageResult);
+    }
+
  
 }
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "App管理 - 巡检计划明细 Request VO")
+@Data
+public class AppInspectionPlanDetailReqVO {
+
+    @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    @NotBlank(message = "批次号不能为空")
+    private String batchNo;
+
+    @Schema(description = "道路id", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    @NotNull(message = "道路id不能为空")
+    private Long roadId;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
+    @NotNull(message = "养护类型不能为空")
+    private Integer planTypeId;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @NotNull(message = "完成状态不能为空")
+    @Min(value = 1, message = "状态最小为1")
+    @Max(value = 3, message = "状态不能大于4")
+    private Integer finishState;
+
+    @Schema(description = "公司ID")
+    @Hidden
+    private Long companyId;
+
+    @Schema(description = "角色IDS")
+    @Hidden
+    private List<Long> roleIds;
+
+    @Schema(description = "业务线")
+    @Hidden
+    private List<String> busiLineList;
+
+    @Schema(description = "系统时间")
+    @Hidden
+    private LocalDateTime localDateTime;
+}
+
+package com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "管理后台 - 巡检明细计划 Response VO")
+@Data
+public class AppInspectionPlanDetailRespVO {
+
+    @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String batchNo;
+
+    @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String planNo;
+
+    @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private Long roadId;
+
+    @Schema(description = "道路", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private String roadName;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
+    @NotNull(message = "养护类型不能为空")
+    private Integer planTypeId;
+
+    @Schema(description = "排序号:第n次计划", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer sortNum;
+
+    @Schema(description = "执行开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime beginTime;
+
+    @Schema(description = "执行时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime endTime;
+
+    @Schema(description = "次数 如：1/3等", requiredMode = Schema.RequiredMode.REQUIRED, example = "1/3")
+    private String rate;
+
+    @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "6415")
+    private Integer cycleId;
+
+    @Schema(description = "计划次数")
+    private Integer planNum;
+
+    @Schema(description = "完成次数")
+    private Integer planFinishNum;
+
+    @Schema(description = "完成状态 1:未完成;2:已完成；", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer finishState;
+}
+
 package com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo;
  
 import com.zteits.urbanops.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
@@ -17,21 +18,25 @@ public class AppInspectionPlanPageReqVO extends PageParam {
     @Schema(description = "道路名称", example = "赵六")
     private String roadName;
  
-    @Schema(description = "状态 1:未完成;3:已完成;4:已失效")
-    @NotNull
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 4, message = "状态不能大于4")
+    @Max(value = 3, message = "状态不能大于4")
     private Integer finishState;
  
     @Schema(description = "公司ID")
+    @Hidden
     private Long companyId;
  
     @Schema(description = "角色IDS")
+    @Hidden
     private List<Long> roleIds;
  
     @Schema(description = "业务线")
+    @Hidden
     private List<String> busiLineList;
  
     @Schema(description = "系统时间")
+    @Hidden
     private LocalDate localDate;
 }
@@ -14,12 +14,14 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE
 @ExcelIgnoreUnannotated
 public class AppInspectionPlanRespVO {
  
+    @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private String batchNo;
  
     @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
     private Long roadId;
  
     @Schema(description = "道路名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
-    private Long roadName;
+    private String roadName;
  
     @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8439")
     private String streetId;
@@ -6,6 +6,8 @@ import java.util.*;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailReqVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
@@ -46,4 +48,11 @@ public interface InspectionPlanDetailMapper extends BaseMapperX&lt;InspectionPlanDe
  
     int deleteByBatchNo(@Param("batchNo") String batchNo);
  
+    /**
+     * 获取巡检计划详情列表
+     *
+     * @param pageReqVO 列表请求
+     * @return 巡检计划详情列表
+     */
+    List<AppInspectionPlanDetailRespVO> getInspectionPlanDetailForApp(@Param("req") AppInspectionPlanDetailReqVO pageReqVO);
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.service.inspectionplan;
  
 import java.util.*;
+
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailReqVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO;
 import jakarta.validation.*;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.pojo.PageParam;
  
 /**
  * 巡检计划 Service 接口
@@ -59,4 +61,11 @@ public interface InspectionPlanDetailService {
      */
     PageResult<InspectionPlanDetailDO> getInspectionPlanDetailPage(InspectionPlanDetailPageReqVO pageReqVO);
  
+    /**
+     * app-检计划明细分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 巡检计划分页
+     */
+    List<AppInspectionPlanDetailRespVO> getInspectionPlanDetailForApp(AppInspectionPlanDetailReqVO pageReqVO);
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.service.inspectionplan;
  
-import cn.hutool.core.collection.CollUtil;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailReqVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO;
+import com.zteits.urbanops.module.system.api.permission.RoleApi;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
  
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
  
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper;
  
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
  
 /**
  * 巡检计划 Service 实现类
@@ -32,6 +34,9 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
     @Resource
     private InspectionPlanDetailMapper inspectionPlanDetailMapper;
  
+    @Resource
+    private RoleApi roleApi;
+
     @Override
     public Long createInspectionPlanDetail(InspectionPlanDetailSaveReqVO createReqVO) {
         // 插入
@@ -82,4 +87,21 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
         return inspectionPlanDetailMapper.selectPage(pageReqVO);
     }
  
+    @Override
+    public List<AppInspectionPlanDetailRespVO> getInspectionPlanDetailForApp(AppInspectionPlanDetailReqVO 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);
+        pageReqVO.setLocalDateTime(LocalDateTime.now());
+        /*2.明细*/
+       return inspectionPlanDetailMapper.getInspectionPlanDetailForApp(pageReqVO);
+    }
+
 }
 \ No newline at end of file
@@ -39,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
  
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -79,9 +80,6 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Resource
     private RoleApi roleApi;
  
-    @Resource
-    private RoleApi poleApi;
-
     @Transactional(rollbackFor = Exception.class)
     @Override
     public CommonResult<Integer> createInspectionPlan(InspectionPlanSaveReqVO createReqVO) {
@@ -332,8 +330,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         pageReqVO.setCompanyId(companyId);
  
         /*1.查询登录用户角色*/
-        List<Long> roleIds = poleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
         pageReqVO.setRoleIds(roleIds);
+        pageReqVO.setLocalDate(LocalDate.now());
         /*2.分页*/
         IPage<AppInspectionPlanRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppInspectionPlanRespVO> page = inspectionPlanMapper.getInspectionPlanAppPage(mpPage, pageReqVO);
@@ -12,4 +12,64 @@
         delete from garden_inspection_plan_detail where batch_no =#{batchNo}
     </delete>
  
+    <select id="getInspectionPlanDetailForApp" resultType="com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO">
+        SELECT
+        a.batch_no,
+        b.plan_no,
+        a.road_id,
+        a.road_name,
+        a.plan_type_id,
+        a.level_id,
+        a.plan_type_id,
+        a.rate,
+        a.cycle_id,
+        b.sort_num,
+        b.plan_num,
+        b.plan_finish_num,
+        b.finish_state,
+        b.begin_time,
+        b.end_time
+        FROM
+        garden_inspection_plan a,
+        garden_inspection_plan_detail b,
+        garden_inspection_plan_role c
+        WHERE
+        a.batch_no = b.batch_no
+        AND b.batch_no=c.batch_no
+        AND a.road_id=b.road_id
+        AND a.dept_id =b.dept_id
+        AND a.deleted = b.deleted
+        AND a.deleted = 0
+        AND a.batch_no = #{req.batchNo}
+        and a.road_id=#{req.roadId}
+        and a.plan_type_id=#{req.planTypeId}
+        AND a.company_id = #{req.companyId}
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND c.role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
+        </if>
+        <if test="req.busiLineList != null and req.busiLineList.size() > 0">
+            AND a.busi_line IN
+            <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
+                #{busiLine}
+            </foreach>
+        </if>
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        <if test="req.finishState == 3">
+            <![CDATA[and b.end_time < #{req.localDateTime}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and b.finish_state = #{req.finishState}
+        </if>
+        <if test="req.finishState == 1">
+            and b.finish_state = #{req.finishState}
+            <![CDATA[ and b.begin_time <= #{req.localDateTime}
+                      and b.end_time >= #{req.localDateTime}]]>
+        </if>
+
+    </select>
+
+
 </mapper>
 \ No newline at end of file
@@ -15,6 +15,7 @@
  
     <select id="getInspectionPlanAppPage" resultType="com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO">
         SELECT
+           a.batch_no,
             a.road_id,
             a.road_name,
             a.plan_type_id,
@@ -26,6 +27,8 @@
             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}
           <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
@@ -42,14 +45,19 @@
                 #{busiLine}
             </foreach>
         </if>
-        <!--状态 1:未完成;3:已完成;4:已失效-->
-        <if test="req.finishState == 4">
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        <if test="req.finishState == 3">
             <![CDATA[and a.end_time < #{req.localDate}]]>
         </if>
-        <if test="req.finishState == 3 or req.finishState == 1">
+        <if test="req.finishState == 2">
             and a.finish_state = #{req.finishState}
         </if>
+        <if test="req.finishState == 1">
+            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,