From 07b601517580893100cf2ba70734568c1d2e0b84 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 28 Mar 2025 14:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml     | 1 -
 .../src/main/resources/mapper/jjh/ent/JServicesListMapper.xml   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
index 4613a58..c7c8ab7 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
@@ -90,7 +90,6 @@ order by a.alert_time desc
 <!--        </where>-->
         ORDER BY
         a.develop_year ASC
-        LIMIT 5
     </select>
     <select id="getIndustryDepth" resultType="com.ruoyi.jjh.ent.entity.response.JIndustryDepthResponse">
         SELECT a.years,
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml
index 35e6b4d..516d1f1 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml
@@ -84,6 +84,7 @@ SELECT * FROM (
                           LEFT JOIN (
                           SELECT a.services_type, COUNT(*) AS qyCount
                           FROM j_services_list a
+                          where years = YEAR(now()) -1
                           GROUP BY a.services_type
                       ) AS b ON a.type = b.services_type
                   WHERE
@@ -127,5 +128,6 @@ ORDER BY FIELD(result.servicesType, 3, 1, 2, 4);
                IFNULL(ROUND(SUM(IFNULL(revenue, 0)) / 100000, 1) + ROUND(SUM(IFNULL(output, 0)) / 100000, 1) +
                       ROUND(SUM(IFNULL(sales, 0)) / 100000, 1), '-') AS addValue
         FROM j_headquarters_revenue
+        where  years = YEAR(NOW()) - 1
     </select>
 </mapper>