feature: 智能控制V2版本 初版结束

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>cn.sciento.farm</groupId>
     <artifactId>wf-equipment-automation-V2</artifactId>
-    <version>1.1.1-RELEASE</version>
+    <version>1.1.2-RELEASE</version>
     <name>wf-equipment-automation-V2</name>
     <description>wf-equipment-automation-V2</description>
 

src/main/resources/mapper/IrrigationTaskMapper.xml

@@ -168,9 +168,14 @@
             <if test="task.status != null">
                 AND `status` = #{task.status}
             </if>
-            <if test="task.enabledFlag != null">
-                AND enabled_flag = #{task.enabledFlag}
-            </if>
+            <choose>
+                <when test="task.enabledFlag != null">
+                    AND enabled_flag = #{task.enabledFlag}
+                </when>
+                <otherwise>
+                    AND enabled_flag != 2
+                </otherwise>
+            </choose>
     </select>
 
     <select id="findGroupNum" resultType="java.lang.Integer">