From 1471a2695c5bdf3bf54aa239974ceade425be86d Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Mon, 5 Aug 2024 15:59:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=B0=8F=E6=95=B0=E7=82=B9?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/dto/BmsDeclarationRecordsDto.java     |  3 +++
 ruoyi-admin/src/main/resources/application.yml   |  2 +-
 .../declaration/BmsDeclarationRecordsMapper.xml  |  7 ++++++-
 .../mapper/jjh/ent/JDataScreenMapper.xml         | 16 ++++++++--------
 .../mapper/jjh/ent/JServicesListMapper.xml       | 10 +++++-----
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java
index fc59872..0938ac9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java
@@ -59,4 +59,7 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
 
     @ApiModelProperty(value = "0=未填报,1=已填报")
     private Integer statusChange;
+
+    @ApiModelProperty(value = "0=按时间排序,1=不按时间排序")
+    private Integer orderChange;
 }
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ba65377..f04e035 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -34,7 +34,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: internet
+    active: druid
   # 文件上传
   servlet:
     multipart:
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
index 0654d3c..99e3418 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml
@@ -206,7 +206,12 @@
             </if>
             <if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
         </where>
-        order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),a.create_time desc, e.dict_sort desc
+        <if test="orderChange == 0">
+            order by a.create_time desc
+        </if>
+        <if test="orderChange == 1">
+            order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),a.create_time desc, e.dict_sort desc
+        </if>
     </select>
     <select id="getAddProject" resultType="com.ruoyi.jjh.ent.entity.JProject">
         SELECT c.qymc                as declareUnit,
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 965e98b..6fd9c64 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
@@ -84,10 +84,10 @@
     <select id="getIndustryDepth" resultType="com.ruoyi.jjh.ent.entity.response.JIndustryDepthResponse">
         SELECT a.years,
                a.industry_categories,
-               IFNULL(a.year_revenue / 10000, '-')   AS yearRevenue,
-               IFNULL(a.add_value / 10000, '-')      AS addValue,
-               IFNULL(a.growth / 10000, '-')         AS growth,
-               IFNULL(a.gdp_proportion / 10000, '-') AS gdpProportion
+               IFNULL(ROUND(a.year_revenue / 10000, 1), '-')   AS yearRevenue,
+               IFNULL(ROUND(a.add_value / 10000, 1), '-')     AS addValue,
+               IFNULL(ROUND(a.growth / 10000, 1), '-')        AS growth,
+               IFNULL(ROUND(a.gdp_proportion / 10000, 1), '-') AS gdpProportion
         FROM j_industry_depth a
         WHERE a.years = YEAR(NOW()) - 1
     </select>
@@ -95,8 +95,8 @@
             resultType="com.ruoyi.jjh.ent.entity.response.JBigMiddleIndustryResponse">
         SELECT a.categories,
                a.middle                                           AS nameType,
-               IFNULL(ROUND(SUM(b.year_revenue) / 10000, 3), '-') AS yearRevenue,
-               IFNULL(ROUND(SUM(b.add_value) / 10000, 3), '-')    AS addValue,
+               IFNULL(ROUND(SUM(b.year_revenue) / 10000, 1), '-') AS yearRevenue,
+               IFNULL(ROUND(SUM(b.add_value) / 10000, 1), '-')    AS addValue,
                IFNULL(b.growth, '-')                              AS growth,
                IFNULL(b.gdp_proportion, '-')                      AS gdpProportion
         FROM j_industry_dictionary a
@@ -110,8 +110,8 @@
     </select>
     <select id="getBigIndustry" resultType="com.ruoyi.jjh.ent.entity.response.JAllIndustryResponse">
         SELECT a.categories                                       AS nameType,
-               IFNULL(ROUND(SUM(b.year_revenue) / 10000, 3), '-') AS yearRevenue,
-               IFNULL(ROUND(SUM(b.add_value) / 10000, 3), '-')    AS addValue,
+               IFNULL(ROUND(SUM(b.year_revenue) / 10000, 1), '-') AS yearRevenue,
+               IFNULL(ROUND(SUM(b.add_value) / 10000, 1), '-')    AS addValue,
                IFNULL(b.growth, '-')                              AS growth,
                IFNULL(b.gdp_proportion, '-')                      AS gdpProportion
         FROM j_industry_dictionary a
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 0fe7130..90788a0 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml
@@ -6,7 +6,7 @@
     <select id="page" resultType="com.ruoyi.jjh.ent.entity.JServicesList">
         SELECT
         a.*,
-        IFNULL( ROUND( b.revenue/ 100000, 3 ), '-' )
+        IFNULL( ROUND( b.revenue/ 100000, 1 ), '-' )
         AS revenue,
         b.years
         FROM
@@ -31,7 +31,7 @@
         SELECT a.services_type,
                count(*)                                       AS qyCount,
                IFNULL(b.add_value, '-')                       AS addValue,
-               IFNULL(ROUND(SUM(b.revenue) / 100000, 3), '-') AS allRevenue
+               IFNULL(ROUND(SUM(b.revenue) / 100000, 1), '-') AS allRevenue
         FROM j_services_list a
                  LEFT JOIN j_business_revenue b ON a.tyshxydm = b.tyshxydm
         GROUP BY a.services_type
@@ -40,9 +40,9 @@
     <select id="selectAllZbCount" resultType="com.ruoyi.jjh.ent.entity.response.JServicesListCountResponse">
         SELECT 5                                                     AS services_type,
                count(*)                                              AS qyCount,
-               IFNULL(ROUND(SUM(taxation) / 100000, 3), '-')         AS allRevenue,
-               IFNULL(ROUND(SUM(IFNULL(revenue, 0)) / 100000, 3) + ROUND(SUM(IFNULL(output, 0)) / 100000, 3) +
-                      ROUND(SUM(IFNULL(sales, 0)) / 100000, 3), '-') AS addValue
+               IFNULL(ROUND(SUM(taxation) / 100000, 1), '-')         AS allRevenue,
+               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
     </select>
 </mapper>