优化

王富生
1 parent 799a221f
Showing 6 changed files with 56 additions and 82 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/FinishStateEnum.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -36,14 +36,11 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam {
     @Schema(description = "计划批次号列表")
     @Hidden
-    private Set<String> batchNos;
+    private Set<Long> roleIds;
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
-    @Schema(description = "系统时间")
-    @Hidden
-    private LocalDateTime localDateTime;
 }
 \ No newline at end of file
@@ -23,23 +23,18 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam {
      * 完成状态 1:未完成;2:已完成;3:已失效
      * @see com.zteits.urbanops.module.garden.enums.FinishStateEnum
      */
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效;4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
     @Max(value = 3, message = "状态不能大于4")
     private Integer finishState;
-    @Schema(description = "批次号")
+    @Schema(description = "角色id列表")
     @Hidden
-    private Set<String> batchNos;
+    private Set<Long> roleIds;
     @Schema(description = "业务线")
     @Hidden
     private List<String> busiLineList;
-
-    @Schema(description = "系统时间")
-    @Hidden
-    private LocalDate localDate;
-
 }
 \ No newline at end of file
@@ -35,10 +35,10 @@ public class AppMaintainPlanPageRoadRespVO{
     @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588")
     private Integer levelId;
-    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效")
+    @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效；4:已终止")
     @NotNull(message = "完成状态不能为空")
     @Min(value = 1, message = "状态最小为1")
-    @Max(value = 3, message = "状态不能大于4")
+    @Max(value = 4, message = "状态不能大于5")
     private Integer finishState;
     @Schema(description = "计划次数", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -50,11 +50,9 @@ public class AppMaintainPlanPageRoadRespVO{
     private Integer planFinishNum;
     @Schema(description = "执行开始时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate beginTime;
     @Schema(description = "执行时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate endTime;
 }
 \ No newline at end of file
@@ -19,7 +19,7 @@ public enum FinishStateEnum {
     EXPIRED(3),
     /**
-     * 过期
+     * 已终止
      */
     STOP(4),
@@ -378,12 +378,12 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         }
         /*1.查询登录用户计划编码列表*/
-        Set<String> batchNos = this.getBatchNosByLoginUserId();
-        if(CollectionUtils.isEmpty(batchNos)){
-            return PageResult.empty();
+        /*1.查询登录用户角色*/
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            new PageResult<>(null, 0L);
         }
-        pageReqVO.setBatchNos(batchNos);
-        pageReqVO.setLocalDate(LocalDate.now());
+        pageReqVO.setRoleIds(new HashSet<>(roleIds));
         /*2.分页*/
         IPage<AppMaintainPlanPageRoadRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPageRoadRespVO> page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO);
@@ -421,12 +421,12 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
             pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
         }
         /*1.查询登录用户计划编码列表*/
-        Set<String> batchNos = this.getBatchNosByLoginUserId();
-        if(CollectionUtils.isEmpty(batchNos)){
-            return PageResult.empty();
+        List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            return new PageResult<>(null, 0L);
         }
-        pageReqVO.setBatchNos(batchNos);
-        pageReqVO.setLocalDateTime(LocalDateTime.now());
+
+        pageReqVO.setRoleIds(new HashSet<>(roleIds));
         /*2.分页*/
         IPage<AppMaintainPlanPagePlanTypeRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPagePlanTypeRespVO> page = maintainPlanMapper.appMaintainPlanPlanTypePage(mpPage, pageReqVO);
@@ -25,18 +25,21 @@
         a.begin_time,
         a.end_time
         FROM
-        garden_maintain_plan a
-        JOIN -- 建议用显式JOIN代替隐式连接，可读性更高
-        garden_maintain_plan_detail b ON a.batch_no = b.batch_no
+        garden_maintain_plan a,
+        garden_maintain_plan_detail b,
+        garden_maintain_plan_role c
+        WHERE a.batch_no = b.batch_no
+        AND a.batch_no = c.batch_no
+        AND a.dept_id = c.dept_id
         AND a.deleted = b.deleted
-        WHERE a.deleted = 0
-         <if test="req.roadName != null and req.roadName !=''">
+        AND a.deleted = 0
+        <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
         </if>
-        <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}
+        <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">
@@ -46,48 +49,40 @@
             </foreach>
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and b.finish_state = #{req.finishState}
-            <![CDATA[and a.end_time < #{req.localDate}]]>
-        </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.end_time >= #{req.localDate}]]>
-            <![CDATA[and b.begin_time <= #{req.localDate}]]>
-        </if>
+        and a.finish_state = b.finish_state
+        and a.finish_state = #{req.finishState}
     </select>
     <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
         SELECT
-            c.batch_no,
-            c.plan_no,
-            a.plan_name,
-            a.plan_type_id,
-            a.rate,
-            a.cycle_id,
-            c.plan_num,
-            c.plan_finish_num,
-            c.finish_state,
-            c.begin_time,
-            c.end_time
+        c.batch_no,
+        c.plan_no,
+        a.plan_name,
+        a.plan_type_id,
+        a.rate,
+        a.cycle_id,
+        c.plan_num,
+        c.plan_finish_num,
+        c.finish_state,
+        c.begin_time,
+        c.end_time
         FROM
-            garden_maintain_plan a,
-            garden_maintain_plan_detail c
-        WHERE
-            a.batch_no = c.batch_no
+        garden_maintain_plan a,
+        garden_maintain_plan_detail c,
+        garden_maintain_plan_role d
+        WHERE a.batch_no = c.batch_no
+        AND a.batch_no = d.batch_no
+        AND a.dept_id = d.dept_id
         AND a.deleted=c.deleted
-          AND a.deleted=0
-          AND a.plan_type_id = #{req.planTypeId}
+        AND a.deleted=0
+        AND a.plan_type_id = #{req.planTypeId}
         <if test="req.planName != null and req.planName !=''">
             AND a.plan_type_id LIKE CONCAT('%',#{req.planName},'%')
         </if>
-        <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}
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND d.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">
@@ -97,19 +92,8 @@
             </foreach>
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
-        <if test="req.finishState == 3">
-            and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time < #{req.localDateTime}]]>
-        </if>
-        <if test="req.finishState == 2">
-            and c.finish_state = #{req.finishState}
-        </if>
-        <if test="req.finishState == 1">
-            and c.finish_state = #{req.finishState}
-            <![CDATA[and c.end_time >= #{req.localDateTime}]]>
-            <![CDATA[and c.begin_time <= #{req.localDateTime}]]>
-
-        </if>
+        and c.finish_state =a.finish_state
+        and c.finish_state = #{req.finishState}
     </select>
 </mapper>