From 48fa360e0fdf6fb2e1424a9ded89ddc231fcddb2 Mon Sep 17 00:00:00 2001
From: 王彪总 <thisjava@163.com>
Date: Tue, 16 Dec 2025 16:36:04 +0800
Subject: [PATCH] refactor(garden): 移除重复的查询逻辑

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java | 21 +++++++++++----------
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java     | 21 +++++++++++----------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
index 7274100..7d57958 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
@@ -249,17 +249,18 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
                     .ge(InspectionPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
 
             count = inspectionPlanMapper.selectCount(sql);
-        } else {
-            QueryWrapper<InspectionPlanDO> sql = new QueryWrapper<>();
-            sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId())
-                    .in(InspectionPlanDO::getRoadId, roadIds)
-                    .eq(InspectionPlanDO::getDeleted, 0)
-                    .eq(InspectionPlanDO::getPlanAttr, 2) //临时计划
-                    .le(InspectionPlanDO::getBeginTime, req.getEndTime())      // start_time <= endTime
-                    .ge(InspectionPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
-
-            count = inspectionPlanMapper.selectCount(sql);
         }
+//        else {
+//            QueryWrapper<InspectionPlanDO> sql = new QueryWrapper<>();
+//            sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId())
+//                    .in(InspectionPlanDO::getRoadId, roadIds)
+//                    .eq(InspectionPlanDO::getDeleted, 0)
+//                    .eq(InspectionPlanDO::getPlanAttr, 2) //临时计划
+//                    .le(InspectionPlanDO::getBeginTime, req.getEndTime())      // start_time <= endTime
+//                    .ge(InspectionPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
+//
+//            count = inspectionPlanMapper.selectCount(sql);
+//        }
 
         if (count > 0) {
             throw exception(INSPECTION_PLAN_EXISTS);
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
index 06af398..570e5af 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
@@ -268,17 +268,18 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
                     .ge(MaintainPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
 
             count = maintainPlanMapper.selectCount(sql);
-        } else {
-            QueryWrapper<MaintainPlanDO> sql = new QueryWrapper<>();
-            sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId())
-                    .in(MaintainPlanDO::getRoadId, roadIds)
-                    .eq(MaintainPlanDO::getDeleted, 0)
-                    .eq(MaintainPlanDO::getPlanAttr, 2) //临时计划
-                    .le(MaintainPlanDO::getBeginTime, req.getEndTime())      // start_time <= endTime
-                    .ge(MaintainPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
-
-            count = maintainPlanMapper.selectCount(sql);
         }
+//        else {
+//            QueryWrapper<MaintainPlanDO> sql = new QueryWrapper<>();
+//            sql.lambda().eq(MaintainPlanDO::getPlanTypeId, req.getPlanTypeId())
+//                    .in(MaintainPlanDO::getRoadId, roadIds)
+//                    .eq(MaintainPlanDO::getDeleted, 0)
+//                    .eq(MaintainPlanDO::getPlanAttr, 2) //临时计划
+//                    .le(MaintainPlanDO::getBeginTime, req.getEndTime())      // start_time <= endTime
+//                    .ge(MaintainPlanDO::getEndTime, req.getBeginTime());     // end_time >= startTime
+//
+//            count = maintainPlanMapper.selectCount(sql);
+//        }
 
         if (count > 0) {
             throw exception(INSPECTION_PLAN_EXISTS);
--
libgit2 0.21.4