refactor(garden): 优化巡查养护计划查询逻辑

- 显式JOIN替代隐式连接，提升SQL可读性 - 调整计划状态判断条件，关联明细表字段 - 补充时间范围过滤条件，确保数据准确性 - 修正养护计划类型字典键引用错误 - 统一未完成状态的时间区间判定逻辑

refactor(garden): 优化巡查养护计划查询逻辑
- 显式JOIN替代隐式连接，提升SQL可读性 - 调整计划状态判断条件，关联明细表字段 - 补充时间范围过滤条件，确保数据准确性 - 修正养护计划类型字典键引用错误 - 统一未完成状态的时间区间判定逻辑
王彪总
1 parent 0b01801a
Showing 4 changed files with 26 additions and 11 deletions
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/MaintainPlanDetailMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -158,7 +158,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
             maintainPlan.setRoadName(roadReqVO.getRoadName());
             //计划属性label
             String planAttrLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.GARDEN_PLAN_ATTR_REDIS_KEY, createReqVO.getPlanAttr());
-            String planTypeIdLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.INSPECTION_MAINTAIN_TYPE, createReqVO.getPlanTypeId());
+            String planTypeIdLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.MAINTAIN_TYPE, createReqVO.getPlanTypeId());
             String planNameSuffix = StringUtil.isNotEmpty(createReqVO.getPlanNameSuffix()) ? createReqVO.getPlanNameSuffix() : "";
             maintainPlan.setPlanName(roadReqVO.getRoadName() + planAttrLabel + planTypeIdLabel + planNameSuffix);
             maintainPlanList.add(maintainPlan);
@@ -24,8 +24,10 @@
             a.finish_state,
             a.begin_time,
             a.end_time
-        FROM
-            garden_inspection_plan a
+        FROM garden_inspection_plan a JOIN -- 建议用显式JOIN代替隐式连接，可读性更高
+            garden_inspection_plan_detail b ON
+            a.batch_no = b.batch_no
+            AND a.deleted = b.deleted
         WHERE a.deleted = 0
           <if test="req.roadName != null and req.roadName !=''">
             AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
@@ -44,14 +46,17 @@
         </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 a.finish_state = #{req.finishState}
+            and b.finish_state = #{req.finishState}
         </if>
         <if test="req.finishState == 1">
-            and a.finish_state = #{req.finishState}
+            and b.finish_state = #{req.finishState}
             <![CDATA[and a.end_time >= #{req.localDate}]]>
+            <![CDATA[and b.end_time >= #{req.localDate}]]>
+            <![CDATA[and b.begin_time <= #{req.localDate}]]>
         </if>
     </select>
-</mapper>
 \ No newline at end of file
+</mapper>
@@ -59,6 +59,8 @@
         <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>
     </select>
@@ -26,8 +26,12 @@
         a.end_time
         FROM
         garden_maintain_plan a
-        WHERE a.deleted=0
-        <if test="req.roadName != null and req.roadName !=''">
+        JOIN -- 建议用显式JOIN代替隐式连接，可读性更高
+        garden_maintain_plan_detail b ON
+        a.batch_no = b.batch_no
+        AND a.deleted = b.deleted
+        WHERE 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">
@@ -44,15 +48,17 @@
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
         <if test="req.finishState == 3">
-            and a.finish_state = #{req.finishState}
+            and b.finish_state = #{req.finishState}
             <![CDATA[and a.end_time < #{req.localDate}]]>
         </if>
         <if test="req.finishState == 2">
-            and a.finish_state = #{req.finishState}
+            and b.finish_state = #{req.finishState}
         </if>
         <if test="req.finishState == 1">
-            and a.finish_state = #{req.finishState}
+            and b.finish_state = #{req.finishState}
             <![CDATA[and a.end_time >= #{req.localDate}]]>
+            <![CDATA[and b.end_time >= #{req.localDate}]]>
+            <![CDATA[and b.begin_time <= #{req.localDate}]]>
         </if>
     </select>
@@ -103,6 +109,8 @@
         <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>
     </select>