From db97d633587601611bc750d3c9e3fa97910ce51b Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Sat, 10 Jan 2026 17:24:35 +0800
Subject: [PATCH] 修复不打印完成的-按照类型

---
 urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml | 10 +++++-----
 urbanops-server/src/main/resources/application.yaml                                  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
index 09e4324..4a1be23 100644
--- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
+++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
@@ -108,22 +108,22 @@
             </foreach>
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
-        and c.finish_state =a.finish_state
+        -- and c.finish_state =a.finish_state
         <if test="req.finishState == 1">
-            and a.finish_state = 1
+            and c.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
+            and c.finish_state = 2
         </if>
         <if test="req.finishState == 3">
-            and a.finish_state = 3
+            and c.finish_state = 3
             <![CDATA[and c.begin_time <= #{req.localDateTime}
                      and c.end_time >= #{req.localDateTime}]]>
         </if>
         <if test="req.finishState == 4">
-            and a.finish_state = 4
+            and c.finish_state = 4
             <![CDATA[and c.begin_time <= #{req.localDateTime}
                      and c.end_time >= #{req.localDateTime}]]>
         </if>
diff --git a/urbanops-server/src/main/resources/application.yaml b/urbanops-server/src/main/resources/application.yaml
index d67b2e4..2cfeef0 100644
--- a/urbanops-server/src/main/resources/application.yaml
+++ b/urbanops-server/src/main/resources/application.yaml
@@ -3,7 +3,7 @@ spring:
     name: urbanops-server
 
   profiles:
-    active: dev
+    active: prod
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
--
libgit2 0.21.4