From e0b50eeb08e6897ffd2d5f7120156dd65d67466e Mon Sep 17 00:00:00 2001
From: qqGroup0 <253114712@qq.com>
Date: Tue, 11 Apr 2023 22:33:30 +0800
Subject: [PATCH] =?UTF-8?q?zqq:=E5=A4=9A=E6=9D=A1=E4=BB=B6=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kening/vordm/vo/GroupByUse.java  |  6 ++
 .../vordm/mapper/DisasterInfoMapper.java      |  1 +
 .../vordm/mapper/DisasterInfoMapper.xml       | 97 +++++++++++--------
 3 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java
index 9bf4211..5627be5 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java
@@ -32,4 +32,10 @@ public class GroupByUse {
 	 * 类型
 	 */
 	private String type;
+
+
+	/**
+	 * 字典value
+	 */
+	private String dictValue;
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
index 0d39144..f0281e2 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
@@ -24,6 +24,7 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 										  @Param("disaster_time") String disaster_time,
 										  @Param("name") String name);
 
+
 	/**
 	 * 获取债害详情信息
 	 * @param id
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index d382336..4e3b50a 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -26,7 +26,10 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        di.id ,di.disaster_type,di.disaster_keyword,
+        di
+        .
+        id
+        ,di.disaster_type,di.disaster_keyword,
         di.disaster_time,di.upload_time,di.geometry,
         di.disaster_level,di.disaster_country,di.respond_status,
         di.visit_count,di.spider_type,di.tempend_time,
@@ -34,7 +37,10 @@
         di.respond_time,di.download_count,di.sponsor_organization
     </sql>
     <sql id="Home_Disaster_Info">
-        d.disaster_type,d.disaster_time,d.disaster_country,
+        d
+        .
+        disaster_type
+        ,d.disaster_time,d.disaster_country,
         m.organization
     </sql>
 
@@ -57,65 +63,78 @@
         </where>
     </select>
 
-    <select id="getSelectCondition"  resultType="com.kening.vordm.vo.GroupByUse">
-        select distinct ${name}  as name
+    <select id="getSelectCondition" resultType="com.kening.vordm.vo.GroupByUse">
+        select distinct ${name} AS name , bdb.dict_value AS dictValue
         from disaster_info
-            <if test="disaster_type!=null or disaster_country!=null or  disaster_time!=null"> where  </if>
-
-            <if test="disaster_type!=null"> disaster_type like concat('%',#{disaster_type},'%') </if>
-            <if test="disaster_type!=null and (disaster_country!=null or disaster_time!=null)"> and  </if>
-            <if test="disaster_country!=null"> disaster_country like concat('%',#{disaster_country},'%')  </if>
-            <if test="disaster_time!=null and disaster_country!=null and disaster_time!=null"> and  </if>
-            <if test="disaster_time!=null"> disaster_time like concat('%',#{disaster_time},'%')</if>
+        left join blade_dict_biz bdb on bdb.dict_key = disaster_info.disaster_type
+        <where>
+        <if test="disaster_type !=null and disaster_type!=''">
+            disaster_type = #{disaster_type}
+        </if>
+        <if test="disaster_country !=null and disaster_country!=''">
+            and disaster_country like concat('%',#{disaster_country},'%')
+        </if>
+        <if test="disaster_time!=null and disaster_time!=''">
+            and disaster_time like concat('%',#{disaster_time},'%')
+        </if>
+        </where>
     </select>
 
     <select id="getDisasterStatistics" resultType="com.kening.vordm.vo.GroupByUse">
-        select ${name} as name,count(*) as cnt
+        select ${name} as name, count(*) as cnt
         from disaster_info
         group by ${name}
-        order by cnt desc
-        limit 0,7
+        order by cnt desc limit 0,7
     </select>
 
     <select id="getHomeDisaster" resultType="com.kening.vordm.vo.DisasterMangerInfo">
         select *
-        from   (select distinct manager_id,disaster_id from guest_mamanager_info
-            on g.manager_id=m.id and  g.disaster_id=d.id
-        where d.respond_status=#{respondStatus}
-        order by d.disaster_time desc
+        from (select distinct manager_id, disaster_id
+              from guest_mamanager_info on g.manager_id=m.id and  g.disaster_id=d.id
+              where d.respond_status=#{respondStatus}
+              order by d.disaster_time desc
     </select>
 
     <select id="getAllUser" resultType="com.kening.vordm.vo.UserTenantVo">
-        SELECT
-            bu.organization AS organizationId,
-            bt.tenant_name AS organizationName
-        FROM
-            blade_user bu
-            LEFT JOIN  blade_tenant bt ON bt.id = bu.organization
+        SELECT bu.organization AS organizationId,
+               bt.tenant_name  AS organizationName
+        FROM blade_user bu
+                 LEFT JOIN blade_tenant bt ON bt.id = bu.organization
         GROUP BY bu.organization
     </select>
     <select id="getLeft3Data" resultType="com.kening.vordm.vo.GroupByUse">
-        select t.sponsor_organization as `name`, count(*) as cnt , 'sponsorOrganization' as `type` from disaster_info t GROUP BY t.sponsor_organization ORDER BY cnt desc LIMIT 3
+        select t.sponsor_organization as `name`, count(*) as cnt, 'sponsorOrganization' as `type`
+        from disaster_info t
+        GROUP BY t.sponsor_organization
+        ORDER BY cnt desc LIMIT 3
     </select>
     <select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse">
-        select t.response_organization as `name`, count(*) as cnt, 'responseOrganization' as `type` from guest_manage_disaster_ref t GROUP BY t.response_organization ORDER BY cnt desc LIMIT 3
+        select t.response_organization as `name`, count(*) as cnt, 'responseOrganization' as `type`
+        from guest_manage_disaster_ref t
+        GROUP BY t.response_organization
+        ORDER BY cnt desc LIMIT 3
     </select>
     <select id="getLeft1Data" resultType="com.kening.vordm.vo.GroupByUse">
-         select b.dict_key, b.dict_value as name, count(t.disaster_type) as cnt, 'type' as `type`,
-            CONCAT('/icon_disastertype/icon-',b.dict_key,'.png') as icon
-            from blade_dict_biz b left join disaster_info t on b.dict_key = t.disaster_type
-            where b.`code` = 'disaster' and b.dict_key is not null
-            group by b.dict_key, b.dict_value
-            order by cnt desc
-            limit 7
+        select b.dict_key,
+               b.dict_value                                           as name,
+               count(t.disaster_type)                                 as cnt,
+               'type'                                                 as `type`,
+               CONCAT('/icon_disastertype/icon-', b.dict_key, '.png') as icon
+        from blade_dict_biz b
+                 left join disaster_info t on b.dict_key = t.disaster_type
+        where b.`code` = 'disaster'
+          and b.dict_key is not null
+        group by b.dict_key, b.dict_value
+        order by cnt desc limit 7
     </select>
     <select id="getLeft2Data" resultType="com.kening.vordm.vo.GroupByUse">
-      SELECT b.*, c.img as icon from country_icon c INNER JOIN
-       (select t.disaster_country as name, count(*) as cnt, 'country' as `type`
-		from  disaster_info t
-		group by t.disaster_country
-		order by cnt desc
-		limit 7) b on c.flagname = b.`name`
+        SELECT b.*, c.img as icon
+        from country_icon c
+                 INNER JOIN
+             (select t.disaster_country as name, count(*) as cnt, 'country' as `type`
+              from disaster_info t
+              group by t.disaster_country
+              order by cnt desc limit 7) b on c.flagname = b.`name`
 
     </select>