优化

王富生
1 parent 9c1c6b8f
Showing 7 changed files with 41 additions and 38 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/AppMaintainPlanPageRoadReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -8,7 +8,7 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
@@ -40,6 +40,6 @@ public class AppInspectionPlanPageReqVO extends PageParam {
     @Schema(description = "系统时间")
     @Hidden
-    private LocalDate localDate;
+    private LocalDateTime localDateTime;
 }
@@ -8,7 +8,7 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
@@ -44,7 +44,7 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam {
     @Schema(description = "当前时间")
     @Hidden
-    private LocalDate localDate;
+    private LocalDateTime localDateTime;
@@ -370,7 +370,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         }
         pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
         pageReqVO.setRoleIds(new HashSet<>(roleIds));
-        pageReqVO.setLocalDate(LocalDate.now());
+        pageReqVO.setLocalDateTime(LocalDateTime.now());
         /*2.分页*/
         IPage<AppInspectionPlanRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppInspectionPlanRespVO> page = inspectionPlanMapper.getInspectionPlanAppPage(mpPage, pageReqVO);
@@ -384,7 +384,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         }
         pageReqVO.setRoleIds(new HashSet<>(roleIds));
         pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
-        pageReqVO.setLocalDate(LocalDate.now());
+        pageReqVO.setLocalDateTime(LocalDateTime.now());
         /*2.分页*/
         IPage<AppMaintainPlanPageRoadRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPageRoadRespVO> page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO);
@@ -45,7 +45,7 @@
         <!--状态 1:未完成;2:已完成;3:已失效-->
         <choose>
             <when test="req.finishState == 1">
-                AND b.finish_state = 1
+                AND b.finish_state=1
                 <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
                          AND b.end_time  >= #{req.localDateTime}]]>
             </when>
@@ -15,7 +15,8 @@
     <select id="getInspectionPlanAppPage" resultType="com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO">
         SELECT
-        a.batch_no,
+        b.batch_no,
+        b.plan_no,
         a.road_id,
         a.road_name,
         a.busi_line,
@@ -25,19 +26,19 @@
         a.begin_time,
         a.end_time
         FROM
-        garden_inspection_plan a
-        INNER JOIN (
-        SELECT DISTINCT batch_no
-        FROM garden_inspection_plan_role
-        WHERE deleted = 0
-        AND dept_id = #{req.deptId}
-        <if test="req.roleIds != null and req.roleIds.size() > 0">
-            AND role_id IN
-            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
-                #{roleId}
-            </foreach>
-        </if>
-        ) c ON a.batch_no = c.batch_no
+        garden_inspection_plan_detail b
+        INNER JOIN garden_inspection_plan a ON a.batch_no = b.batch_no
+        INNER JOIN (SELECT DISTINCT batch_no
+             FROM garden_inspection_plan_role
+              WHERE deleted = 0
+              AND dept_id = #{req.deptId}
+                <if test="req.roleIds != null and req.roleIds.size() > 0">
+                    AND role_id IN
+                    <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                        #{roleId}
+                    </foreach>
+                </if>
+        ) c ON b.batch_no = c.batch_no
         WHERE
         a.deleted = 0
         <if test="req.roadName != null and req.roadName !=''">
@@ -51,18 +52,18 @@
         </if>
         <!-- 状态过滤 -->
         <if test="req.finishState == 1">
-            AND a.finish_state = 1
-           <![CDATA[AND a.begin_time <= #{req.localDate}
-            AND a.end_time >= #{req.localDate}]]>
+            AND b.finish_state = 1
+           <![CDATA[AND b.begin_time <= #{req.localDateTime}
+            AND b.end_time >= #{req.localDateTime}]]>
         </if>
         <if test="req.finishState == 2">
-            AND a.finish_state = 2
+            AND b.finish_state = 2
         </if>
         <if test="req.finishState == 3">
-            AND a.finish_state = 3
+            AND b.finish_state = 3
         </if>
         <if test="req.finishState == 4">
-            AND a.finish_state = 4
+            AND b.finish_state = 4
         </if>
@@ -16,16 +16,18 @@
     <select id="appMaintainPlanRoadPage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPageRoadRespVO">
         SELECT
         a.batch_no,
+        b.plan_no,
         a.road_id,
         a.road_name,
         a.level_id,
         a.finish_state,
         a.plan_num,
         a.plan_finish_num,
-        a.begin_time,
-        a.end_time
+        b.begin_time,
+        b.end_time
         FROM
-        garden_maintain_plan a
+        garden_inspection_plan_detail b
+        INNER JOIN garden_maintain_plan a ON b.batch_no = a.batch_no and a.deleted = b.deleted
         INNER JOIN (
         SELECT DISTINCT batch_no
         FROM garden_maintain_plan_role
@@ -37,7 +39,7 @@
                 #{roleId}
             </foreach>
         </if>
-        ) c ON a.batch_no = c.batch_no
+        ) c ON b.batch_no = c.batch_no
         WHERE
         a.deleted = 0
         <if test="req.roadName != null and req.roadName != ''">
@@ -52,21 +54,21 @@
         <!-- 状态过滤 -->
         <choose>
             <when test="req.finishState == 1">
-                AND a.finish_state = 1
-                <![CDATA[AND a.begin_time  <=  #{req.localDate}
-                AND a.end_time  >= #{req.localDate}]]>
+                AND b.finish_state = 1
+                <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
+                AND b.end_time  >= #{req.localDateTime}]]>
             </when>
             <when test="req.finishState == 2">
-                AND a.finish_state = 2
+                AND b.finish_state = 2
             </when>
             <when test="req.finishState == 3">
-                AND a.finish_state = 3
+                AND b.finish_state = 3
             </when>
             <when test="req.finishState == 4">
-                AND a.finish_state = 4
+                AND b.finish_state = 4
             </when>
         </choose>
-        ORDER BY a.id desc
+        ORDER BY b.id desc
     </select>
     <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">