From 8ccfae47d3fe6bae05ea4b8f614216f4ccc191a2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 03 八月 2024 14:39:05 +0800
Subject: [PATCH] 查重点点位和省厅点位

---
 ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 45fc2ec..ae68b76 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -105,7 +105,13 @@
     <select id="selectScoreIndex" resultType="java.util.Map">
         select t.* from ${tableName} t
         left join sys_dept d on t.dept_id = d.dept_id
-        where t.dept_id =#{deptId} and date_format(t.create_time,'%Y-%m')  = #{date}
+        where t.dept_id = #{deptId}
+        <if test="date != null">
+            and date_format(t.create_time,'%Y-%m') = #{date}
+        </if>
+        <if test="quarter != null and quarter.size > 0">
+            and date_format(t.create_time, '%Y-%m') between #{quarter[0]} and #{quarter[1]}
+        </if>
         ${params.dataScope}
     </select>
 
@@ -114,4 +120,20 @@
         (#{score.score},#{score.deptId},#{score.templateId},#{score.examineTag},#{score.examineCategory},#{score.createTime})
     </foreach>
     </insert>
+
+    <select id="selectCheckScoreMap" resultType="com.ycl.platform.domain.entity.CheckScore">
+        SELECT
+            id,
+            tcs.dept_id,
+            examine_category,
+            ROUND(AVG(score) OVER(PARTITION BY tcs.dept_id, examine_category), 2) AS score,
+            tcs.create_time AS createTime
+        FROM
+            t_check_score tcs
+                LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
+        WHERE
+            examine_tag = #{examineTag}
+          AND DATE_FORMAT(tcs.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{startDate}, '%Y-%m') AND DATE_FORMAT(#{endDate}, '%Y-%m')
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0