diff --git 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 index 566d7a10..730543c0 100644 --- 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 @@ AND ( - (a.year = #{bo.startYear} AND a.quarter >= #{bo.startQuarter}) + (a.year = #{bo.startYear} AND a.quarter = #{bo.startQuarter}) OR (a.year > #{bo.startYear} AND a.year < #{bo.endYear}) - OR (a.year = #{bo.endYear} AND a.quarter <= #{bo.endQuarter}) + OR (a.year = #{bo.endYear} AND a.quarter = #{bo.endQuarter}) ) diff --git 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 index 89036ff0..56d03c18 100644 --- 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 @@ AND ( - (a.year = #{bo.startYear} AND a.quarter >= #{bo.startQuarter}) + (a.year = #{bo.startYear} AND a.quarter = #{bo.startQuarter}) OR (a.year > #{bo.startYear} AND a.year < #{bo.endYear}) - OR (a.year = #{bo.endYear} AND a.quarter <= #{bo.endQuarter}) + OR (a.year = #{bo.endYear} AND a.quarter = #{bo.endQuarter}) )