From 18891c60ab1c06a4acc85d0ec54dee50d1b1a19f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 07 四月 2025 17:20:07 +0800
Subject: [PATCH] bug修改

---
 finance-system/src/main/resources/mapper/system/TbDataScreenScoreMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/finance-system/src/main/resources/mapper/system/TbDataScreenScoreMapper.xml b/finance-system/src/main/resources/mapper/system/TbDataScreenScoreMapper.xml
index c63688a..e1a2d4e 100644
--- a/finance-system/src/main/resources/mapper/system/TbDataScreenScoreMapper.xml
+++ b/finance-system/src/main/resources/mapper/system/TbDataScreenScoreMapper.xml
@@ -62,10 +62,10 @@
     AND tbd.dept_area_code = #{areaCode}
     AND tbsc.id = #{dataScreenConfigId}
     <if test="yearType==1">
-      AND YEAR(tbd.reporting_time) = YEAR(CURDATE())
+      AND YEAR(tbd.reporting_time) = SUBSTRING(tbd.quarter, 1, 4)
     </if>
     <if test="yearType==2">
-      AND YEAR(tbd.reporting_time) = YEAR(CURDATE())-1
+      AND YEAR(tbd.reporting_time) = SUBSTRING(tbd.quarter, 1, 4)-1
     </if>
   </select>
   <select id="selectIndicators"
@@ -78,10 +78,10 @@
     AND tbd.dept_area_code = #{areaCode}
     AND tbsc.type = #{dataScreenConfigEnum}
     <if test="yearType!=null and yearType==1">
-      AND YEAR(tbd.reporting_time) = YEAR(CURDATE())
+      AND YEAR(tbd.reporting_time) = SUBSTRING(#{nowQuarter}, 1, 4)
     </if>
     <if test="yearType!=null and yearType==2">
-      AND YEAR(tbd.reporting_time) = YEAR(CURDATE())-1
+      AND YEAR(tbd.reporting_time) = SUBSTRING(#{nowQuarter}, 1, 4) -1
     </if>
     <if test="nowQuarter!=null and nowQuarter != ''">
       AND tbd.quarter = #{nowQuarter}

--
Gitblit v1.7.1