Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, buss plan planStatusList See merge request LiuChao/foton-slrs-system-rest!337
2021-12-29 17:54:50 +08:00
parent cab273dae4 5311451b1c
commit a4b9f80e9f
3 changed files with 16 additions and 2 deletions
@@ -226,8 +226,11 @@
            <if test="area != null and area != ''">
                and area = #{area}
            </if>
-            <if test="planStatus != null and planStatus != ''">
-                and plan_status = #{planStatus}
+            <if test="planStatusList != null">
+                and plan_status in
+                <foreach collection="planStatusList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
            </if>
            <if test="reviseStatus != null and reviseStatus != ''">
                and revise_status = #{reviseStatus}