From ba421d977e745d18a6264353c739bcaaf44c40d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 08 四月 2024 18:39:41 +0800
Subject: [PATCH] 历史数据模块接口

---
 ruoyi-system/src/main/resources/mapper/system/TbScoreMapper.xml |   62 +++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TbScoreMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbScoreMapper.xml
index da9b730..c2766c7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TbScoreMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TbScoreMapper.xml
@@ -4,15 +4,15 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.TbScore">
-        <id column="id" property="id" />
-        <result column="basic_data_config_id" property="basicDataConfigId" />
-        <result column="basic_data_id" property="basicDataId" />
-        <result column="score" property="score" />
-        <result column="del_flag" property="delFlag" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
+        <id column="id" property="id"/>
+        <result column="basic_data_config_id" property="basicDataConfigId"/>
+        <result column="basic_data_id" property="basicDataId"/>
+        <result column="score" property="score"/>
+        <result column="del_flag" property="delFlag"/>
+        <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -21,23 +21,39 @@
     </sql>
     <select id="pageScore" resultType="com.ruoyi.system.vo.ScoreVO">
         SELECT
-            tbdc.type_name,
-            tbdc.calculate_type,
-            ts.score
+        tbdc.type_name,
+        tbdc.calculate_type,
+        ts.score
         FROM
-            tb_score ts
-                LEFT JOIN tb_basic_data tbd ON ts.basic_data_id = tbd.id
-                LEFT JOIN tb_basic_data_config tbdc ON ts.basic_data_config_id = tbdc.id
+        tb_score ts
+        LEFT JOIN tb_basic_data tbd ON ts.basic_data_id = tbd.id
+        LEFT JOIN tb_basic_data_config tbdc ON ts.basic_data_config_id = tbdc.id
         WHERE
-            1=1
-            AND tbd.id = #{query.basicDataId}
-            <if test="query.typeName !=null and query.typeName!=''">
-                AND tbdc.type_name like Concat('%',#{query.typeName},'%')
-            </if>
-            <if test="query.typeName !=null and query.typeName!=''">
-                AND tbdc.calculate_type = #{query.type}
-            </if>
+        1=1
+        AND tbd.id = #{query.basicDataId}
+        <if test="query.typeName !=null and query.typeName!=''">
+            AND tbdc.type_name like Concat('%',#{query.typeName},'%')
+        </if>
+        <if test="query.typeName !=null and query.typeName!=''">
+            AND tbdc.calculate_type = #{query.type}
+        </if>
 
     </select>
+    <select id="scoreCalculateDetail" resultType="com.ruoyi.system.vo.ScoreDetailVO">
+        SELECT
+        su.area_name,
+        ts.score,
+        su.person_in_charge,
+        su.phone_number
+        FROM tb_score ts
+        LEFT JOIN tb_basic_data tbd ON ts.basic_data_id = tbd.id
+        LEFT JOIN sys_user su ON tbd.dept_area_code = su.area_code
+        <where>
+            ts.basic_data_config_id = #{query.id}
+            <if test="query.areaName != null and query.areaName != ''">
+                AND su.area_name LIKE CONCAT('%',#{query.areaName},'%')
+            </if>
+        </where>
+    </select>
 
 </mapper>

--
Gitblit v1.7.1