From 4b5624af301dfbdcf54b65dc55aadde1b6a8efd5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 24 七月 2024 19:55:24 +0800
Subject: [PATCH] bug修改,查询季度写死“2024年一季度”

---
 finance-system/src/main/resources/mapper/system/TbBasicDataMapper.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/finance-system/src/main/resources/mapper/system/TbBasicDataMapper.xml b/finance-system/src/main/resources/mapper/system/TbBasicDataMapper.xml
index 0ab121e..f5124c4 100644
--- a/finance-system/src/main/resources/mapper/system/TbBasicDataMapper.xml
+++ b/finance-system/src/main/resources/mapper/system/TbBasicDataMapper.xml
@@ -95,7 +95,7 @@
   <select id="getFieldAndScoreData" resultType="com.finance.system.vo.FieldAndScoreDataVO">
     SELECT tbdc.id,
     tbdc.type_name,
-    ts.score,
+    ROUND(ts.score,2) AS score,
     tbdc.max_score,
     tbd.dept_area_code,
     tbdc.basic_data_category_id AS basicDataCategoryId,
@@ -107,9 +107,12 @@
     LEFT JOIN tb_basic_data_config tbdc ON ts.basic_data_config_id = tbdc.id
     LEFT JOIN tb_basic_data_category tbdc2 ON tbdc2.id = tbdc.basic_data_category_id
     LEFT JOIN tb_basic_data_category tbdc3 ON tbdc2.parent_id = tbdc3.id
+    LEFT JOIN sys_user su ON tbd.dept_area_code = su.area_code
     <where>
-      tbd.`quarter` = #{nowQuarter}
-      <if test="areaCode!=null and areaCode != ''">
+      tbd.`quarter` = #{nowQuarter} AND su.user_id IN (SELECT user_id FROM sys_user WHERE
+      area_code
+      LIKE CONCAT( SUBSTRING(#{areaCode}, 0, 4 ), '%' ) AND user_type = 2 AND area_level = 4)
+      <if test="isAll!=null and isAll == 2">
         AND tbd.dept_area_code = #{areaCode}
       </if>
       <if test="yearType==1">

--
Gitblit v1.7.1