监督端-态势趋势修改

2 weeks ago · 6844bd589c
2 changed files with 4 additions and 4 deletions
--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml
@ -29,9 +29,9 @@

        <if test="bo.startYear != null and bo.startQuarter != null and bo.endYear != null and bo.endQuarter != null">
            AND (
-                (a.year = #{bo.startYear} AND a.quarter &gt;= #{bo.startQuarter})
+                (a.year = #{bo.startYear} AND a.quarter = #{bo.startQuarter})
                OR (a.year &gt; #{bo.startYear} AND a.year &lt; #{bo.endYear})
-                OR (a.year = #{bo.endYear} AND a.quarter &lt;= #{bo.endQuarter})
+                OR (a.year = #{bo.endYear} AND a.quarter = #{bo.endQuarter})
            )
        </if>

--- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml
@ -31,9 +31,9 @@

        <if test="bo.startYear != null and bo.startQuarter != null and bo.endYear != null and bo.endQuarter != null">
            AND (
-                (a.year = #{bo.startYear} AND a.quarter &gt;= #{bo.startQuarter})
+                (a.year = #{bo.startYear} AND a.quarter = #{bo.startQuarter})
                OR (a.year &gt; #{bo.startYear} AND a.year &lt; #{bo.endYear})
-                OR (a.year = #{bo.endYear} AND a.quarter &lt;= #{bo.endQuarter})
+                OR (a.year = #{bo.endYear} AND a.quarter = #{bo.endQuarter})
            )
        </if>