From 6844bd589c7e6e5b75e641bb1a1d9b746048937c Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Wed, 21 Oct 2026 15:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=80=81=E5=8A=BF?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enforcementcode/DashboardSituationTrendAreaMapper.xml | 4 ++-- .../enforcementcode/DashboardSituationTrendDomainMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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}) )