优化

王富生
1 parent 579de493
Showing 7 changed files with 60 additions and 3 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/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/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/InspectionPlanMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -8,6 +8,7 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Set;
@@ -37,4 +38,8 @@ public class AppInspectionPlanPageReqVO extends PageParam {
     @Hidden
     private Long deptId;
+    @Schema(description = "系统时间")
+    @Hidden
+    private LocalDate localDate;
+
 }
@@ -46,5 +46,9 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam {
     @Hidden
     private Long deptId;
+    @Schema(description = "开始时间")
+    @Hidden
+    private LocalDateTime localDateTime;
+
 }
 \ No newline at end of file
@@ -42,6 +42,10 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam {
     @Hidden
     private Long deptId;
+    @Schema(description = "当前时间")
+    @Hidden
+    private LocalDate localDate;
+
 }
 \ No newline at end of file
@@ -370,6 +370,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         }
         pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
         pageReqVO.setRoleIds(new HashSet<>(roleIds));
+        pageReqVO.setLocalDate(LocalDate.now());
         /*2.分页*/
         IPage<AppInspectionPlanRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppInspectionPlanRespVO> page = inspectionPlanMapper.getInspectionPlanAppPage(mpPage, pageReqVO);
@@ -384,6 +384,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         }
         pageReqVO.setRoleIds(new HashSet<>(roleIds));
         pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
+        pageReqVO.setLocalDate(LocalDate.now());
         /*2.分页*/
         IPage<AppMaintainPlanPageRoadRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPageRoadRespVO> page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO);
@@ -404,6 +405,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         }
         pageReqVO.setDeptId(SecurityFrameworkUtils.getDeptId());
         pageReqVO.setRoleIds(new HashSet<>(roleIds));
+        pageReqVO.setLocalDateTime(LocalDateTime.now());
         /*2.分页*/
         IPage<AppMaintainPlanPagePlanTypeRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanPagePlanTypeRespVO> page = maintainPlanMapper.appMaintainPlanPlanTypePage(mpPage, pageReqVO);
@@ -53,7 +53,22 @@
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效 4:终止-->
         and b.finish_state = a.finish_state
-        and b.finish_state = #{req.finishState}
+        <!--状态 1:未完成;2:已完成;3:已失效-->
+        and a.finish_state = b.finish_state
+        <if test="req.finishState == 1">
+            and a.finish_state = 1
+            <![CDATA[and a.begin_time <= #{req.localDate}
+                     and a.end_time >= #{req.localDate}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and a.finish_state = 2
+        </if>
+        <if test="req.finishState == 3">
+            and a.finish_state = 3
+        </if>
+        <if test="req.finishState == 4">
+            and a.finish_state = 4
+        </if>
     </select>
 </mapper>
@@ -55,7 +55,20 @@
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
         and a.finish_state = b.finish_state
-        and a.finish_state = #{req.finishState}
+        <if test="req.finishState == 1">
+            and a.finish_state = 1
+            <![CDATA[and a.begin_time <= #{req.localDate}
+                     and a.end_time >= #{req.localDate}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and a.finish_state = 2
+        </if>
+        <if test="req.finishState == 3">
+            and a.finish_state = 3
+        </if>
+        <if test="req.finishState == 4">
+            and a.finish_state = 4
+        </if>
     </select>
     <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO">
@@ -102,7 +115,20 @@
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
         and c.finish_state =a.finish_state
-        and c.finish_state = #{req.finishState}
+        <if test="req.finishState == 1">
+            and a.finish_state = 1
+            <![CDATA[and c.begin_time <= #{req.localDateTime}
+                     and c.end_time >= #{req.localDateTime}]]>
+        </if>
+        <if test="req.finishState == 2">
+            and a.finish_state = 2
+        </if>
+        <if test="req.finishState == 3">
+            and a.finish_state = 3
+        </if>
+        <if test="req.finishState == 4">
+            and a.finish_state = 4
+        </if>
     </select>
 </mapper>