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/TbScoreMapper.xml |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/finance-system/src/main/resources/mapper/system/TbScoreMapper.xml b/finance-system/src/main/resources/mapper/system/TbScoreMapper.xml
index 1ef4e11..f2334d7 100644
--- a/finance-system/src/main/resources/mapper/system/TbScoreMapper.xml
+++ b/finance-system/src/main/resources/mapper/system/TbScoreMapper.xml
@@ -68,23 +68,11 @@
     LEFT JOIN sys_user su ON tbc.dept_area_code = su.area_code
     <where>
       tbc.quarter = #{previousQuarter}
-      AND YEAR(tbc.reporting_time) = YEAR(
-      CURDATE())
       AND su.user_id in (SELECT user_id
       FROM sys_user
-      WHERE (
-      (
-      #{areaCode} = '510000'
-      AND area_code LIKE CONCAT( SUBSTRING( #{areaCode}, 1, 2 ), '%' ))
-      OR (
-      #{areaCode} != '510000'
-      AND area_code LIKE CONCAT( SUBSTRING( #{areaCode}, 1, 4 ), '%' ))
-      OR (
-      #{areaCode}= '510100'
-      AND area_code IN ( '510008', '510015', '510017', '510025' ))
+      WHERE user_type = 2
+      AND area_level in (1,2,3,4)
       )
-      AND user_type = 2
-      AND area_level in (1,2,3,4))
     </where>
 
     GROUP BY tbc.dept_area_code
@@ -127,7 +115,7 @@
         AND su.area_code=#{query.areaCode}
       </if>
       <if test="query.previousQuarter != null and query.previousQuarter != ''">
-        AND tbd.quarter=#{previousQuarter}
+        AND tbd.quarter=#{query.previousQuarter}
       </if>
       group by su.area_code
     </where>

--
Gitblit v1.7.1