From 2da6576ce17cb18f042f561648230736945ec4c1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 10 四月 2024 19:35:16 +0800
Subject: [PATCH] 大屏数据配置接口

---
 ruoyi-system/src/main/resources/mapper/system/TbBasicDataMapper.xml |  113 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TbBasicDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbBasicDataMapper.xml
index 3e4e7d0..1958646 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TbBasicDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TbBasicDataMapper.xml
@@ -1,61 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.TbBasicDataMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.TbBasicData">
-        <id column="id" property="id"/>
-        <result column="quarter" property="quarter"/>
-        <result column="dept_area_code" property="deptAreaCode"/>
-        <result column="transfer_payment_scale" property="transferPaymentScale"/>
-        <result column="current_gdp" property="currentGdp"/>
-        <result column="remark" property="remark"/>
-        <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>
+  <!-- 通用查询映射结果 -->
+  <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.TbBasicData">
+    <id column="id" property="id"/>
+    <result column="quarter" property="quarter"/>
+    <result column="dept_area_code" property="deptAreaCode"/>
+    <result column="transfer_payment_scale" property="transferPaymentScale"/>
+    <result column="current_gdp" property="currentGdp"/>
+    <result column="remark" property="remark"/>
+    <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"/>
+    <result column="reporting_time" property="reportingTime"/>
+  </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, quarter, dept_id, transfer_payment_scale, current_gdp, remark, status, del_flag, create_by, create_time, update_by, update_time
-    </sql>
-    <select id="fieldsStatics" resultType="com.ruoyi.system.vo.CurrentFieldsVO">
-        SELECT
-        tbd.id,
-        su.area_name,
-        IF(tbd.`quarter` IS NULL, CONCAT(YEAR(NOW()), '年',
-        CASE
-        WHEN MONTH(NOW()) BETWEEN 1 AND 3 THEN '一季度'
-        WHEN MONTH(NOW()) BETWEEN 4 AND 6 THEN '二季度'
-        WHEN MONTH(NOW()) BETWEEN 7 AND 9 THEN '三季度'
-        ELSE '四季度'
-        END), tbd.`quarter`) AS `quarter`,
-        su.person_in_charge,
-        su.phone_number,
-        tbd.create_time,
-        COALESCE(tbd.`status`, 1) AS `status`
-        FROM
-        (SELECT * FROM sys_user WHERE user_type = 2) AS su
-        LEFT JOIN
-        (SELECT * FROM tb_basic_data WHERE `quarter` = #{dto.quarter}) AS tbd ON su.area_code = tbd.dept_area_code
-        <where>
-            tbd.quarter = #{dto.quarter}
-            <if test="dto.areaName != null and dto.areaName !=''">
-                AND su.area_name LIKE CONCAT('%',#{dto.areaName},'%')
-            </if>
-            <if test="dto.status != null">
-                AND tbd.status = #{dto.status}
-            </if>
-            <if test="dto.personInCharge != null and dto.personInCharge !=''">
-                AND su.person_in_charge LIKE CONCAT('%',#{dto.personInCharge},'%')
-            </if>
-            <if test="dto.phoneNumber != null and dto.phoneNumber != ''">
-                AND su.phone_number LIKE CONCAT('%',#{dto.phoneNumber},'%')
-            </if>
-        </where>
-    </select>
+  <!-- 通用查询结果列 -->
+  <sql id="Base_Column_List">
+    id, quarter, dept_id, transfer_payment_scale, current_gdp, remark, status, del_flag, create_by, create_time, update_by, update_time,reporting_time
+  </sql>
+  <select id="fieldsStatics" resultType="com.ruoyi.system.vo.CurrentFieldsVO">
+    SELECT
+    tbd.id,
+    su.area_name,
+    IF(tbd.`quarter` IS NULL, CONCAT(YEAR(NOW()), '年',
+    CASE
+    WHEN MONTH(NOW()) BETWEEN 1 AND 3 THEN '一季度'
+    WHEN MONTH(NOW()) BETWEEN 4 AND 6 THEN '二季度'
+    WHEN MONTH(NOW()) BETWEEN 7 AND 9 THEN '三季度'
+    ELSE '四季度'
+    END), tbd.`quarter`) AS `quarter`,
+    su.person_in_charge,
+    su.phone_number,
+    tbd.create_time,
+    COALESCE(tbd.`status`, 1) AS `status`
+    FROM
+    (SELECT * FROM sys_user WHERE user_type = 2) AS su
+    LEFT JOIN
+    (SELECT * FROM tb_basic_data WHERE `quarter` = #{dto.quarter}) AS tbd ON su.area_code =
+    tbd.dept_area_code
+    <where>
+      tbd.quarter = #{dto.quarter}
+      <if test="dto.areaName != null and dto.areaName !=''">
+        AND su.area_name LIKE CONCAT('%',#{dto.areaName},'%')
+      </if>
+      <if test="dto.status != null">
+        AND tbd.status = #{dto.status}
+      </if>
+      <if test="dto.personInCharge != null and dto.personInCharge !=''">
+        AND su.person_in_charge LIKE CONCAT('%',#{dto.personInCharge},'%')
+      </if>
+      <if test="dto.phoneNumber != null and dto.phoneNumber != ''">
+        AND su.phone_number LIKE CONCAT('%',#{dto.phoneNumber},'%')
+      </if>
+    </where>
+  </select>
 
 </mapper>

--
Gitblit v1.7.1