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/TbBasicDataConfigMapper.xml | 44 +++++++++++++++++++++++++++++++------------- 1 files changed, 31 insertions(+), 13 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml index a18d386..7944fab 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TbBasicDataConfigMapper.xml @@ -4,24 +4,42 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.TbBasicDataConfig"> - <id column="id" property="id" /> - <result column="basic_data_category_id" property="basicDataCategoryId" /> - <result column="type_name" property="typeName" /> - <result column="field_description" property="fieldDescription" /> - <result column="calculate_type" property="calculateType" /> - <result column="number_calculate_formula" property="numberCalculateFormula" /> - <result column="field_id_str" property="fieldIdStr" /> - <result column="status" property="status" /> - <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_category_id" property="basicDataCategoryId"/> + <result column="type_name" property="typeName"/> + <result column="field_description" property="fieldDescription"/> + <result column="calculate_type" property="calculateType"/> + <result column="number_calculate_formula" property="numberCalculateFormula"/> + <result column="field_id_str" property="fieldIdStr"/> + <result column="status" property="status"/> + <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> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, basic_data_category_id, type_name, field_description, calculate_type, number_calculate_formula, field_id_str, status, del_flag, create_by, create_time, update_by, update_time </sql> + <select id="scoreCalculatePage" resultType="com.ruoyi.system.vo.ScoreCalculateVO"> + SELECT tdc.id, + tdc.type_name, + tdc.calculate_type + FROM tb_score ts + 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} + <if test="query.typeName !=null and query.typeName != ''"> + AND tdc.type_name LIKE CONCAT('%',#{query.typeName},'%') + </if> + <if test="query.type !=null"> + AND tdc.calculate_type LIKE CONCAT('%',#{query.type},'%') + </if> + </where> + GROUP BY tdc.type_name + </select> </mapper> -- Gitblit v1.7.1