From d68c61517a3a6d4ec4d47844c21bdc143f99cbab Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 四月 2024 22:58:05 +0800
Subject: [PATCH] 大屏接口
---
ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml
index 5943e99..3e63b49 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml
@@ -12,6 +12,7 @@
<result column="calculate_type" property="calculateType"/>
<result column="number_calculate_formula" property="numberCalculateFormula"/>
<result column="field_id_str" property="fieldIdStr"/>
+ <result column="max_score" property="maxScore"/>
<result column="status" property="status"/>
<result column="del_flag" property="delFlag"/>
<result column="create_by" property="createBy"/>
@@ -32,7 +33,7 @@
LEFT JOIN tb_basic_data tbd ON ts.basic_data_id = tbd.id
LEFT JOIN tb_basic_data_config tdc ON ts.basic_data_config_id = tdc.id
<where>
- tbd.`quarter` = #{query.quarter}
+ tbd.`quarter` = #{query.quarter} AND ts.del_flag = 0 AND tbd.del_flag = 0 AND tdc.del_flag = 0
<if test="query.typeName !=null and query.typeName != ''">
AND tdc.type_name LIKE CONCAT('%',#{query.typeName},'%')
</if>
@@ -41,6 +42,7 @@
</if>
</where>
GROUP BY tdc.type_name
+
</select>
<select id="queryPage" resultType="com.ruoyi.system.vo.BasicDataConfigVO">
SELECT tbdc.id,tbdc.type_name,tbdc.calculate_type,tbdc.status,tbdc2.basic_data_category_name AS
@@ -48,8 +50,9 @@
FROM tb_basic_data_config tbdc
LEFT JOIN tb_basic_data_category tbdc2 ON tbdc.basic_data_category_id = tbdc2.id
<where>
- <if test="query.basicDataConfigName != null and query.basicDataConfigName !=''">
- AND tbdc.type_name LIKE CONCAT('%',#{query.basicDataConfigName},'%')
+ tbdc.del_flag = 0 AND tbdc2.del_flag = 0
+ <if test="query.typeName != null and query.typeName !=''">
+ AND tbdc.type_name LIKE CONCAT('%',#{typeName},'%')
</if>
<if test="query.status !=null">
AND tbdc.status = #{query.status}
@@ -57,6 +60,7 @@
<if test="query.calculateType !=null">
AND tbdc.calculate_type = #{query.calculateType}
</if>
+ ORDER BY tbdc.create_time DESC
</where>
</select>
--
Gitblit v1.7.1