Merge remote-tracking branch 'origin/master'

颜惠青
2 parents a83fd943 833dcd73
Showing 2 changed files with 10 additions and 10 deletions
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
urbanops-server/src/main/resources/application.yaml
@@ -47,21 +47,21 @@
         <!-- 状态过滤 -->
         <choose>
             <when test="req.finishState == 1">
-                AND b.finish_state = 1
+                AND a.finish_state = 1
                 <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
                 AND b.end_time  >= #{req.localDateTime}]]>
             </when>
             <when test="req.finishState == 2">
-                AND b.finish_state = 2
+                AND a.finish_state = 2
             </when>
             <when test="req.finishState == 3">
-                AND b.finish_state = 3
+                AND a.finish_state = 3
                 <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
                 AND b.end_time  >= #{req.localDateTime}]]>
             </when>
             <when test="req.finishState == 4">
-                AND b.finish_state = 4
+                AND a.finish_state = 4
                 <![CDATA[AND b.begin_time  <=  #{req.localDateTime}
                 AND b.end_time  >= #{req.localDateTime}]]>
             </when>
@@ -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>
@@ -3,7 +3,7 @@ spring:
     name: urbanops-server
   profiles:
-    active: dev
+    active: prod
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。