zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-V1.10.0' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev-V1.10.0

dev-V1.10.0
wangmingyong@163.com 2 weeks ago
parent
05d9a57e45 6844bd589c
commit
2e22a52663
2 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml
  2. 4
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml

4
zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml
View File

@ -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>

4
zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml
View File

@ -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>

Write Preview
Loading…
Cancel
Save