From ea517025f4c96d7555d4ec4f5e5482880d9af782 Mon Sep 17 00:00:00 2001
From: why <986973311@qq.com>
Date: Mon, 10 Apr 2023 09:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E5=AF=BC=E8=88=AA=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vordm/controller/DisasterInfoController.java   | 14 +++++++++++++-
 .../kening/vordm/mapper/DisasterInfoMapper.java    |  4 +++-
 .../com/kening/vordm/mapper/DisasterInfoMapper.xml | 10 ++++++----
 .../kening/vordm/service/DisasterInfoService.java  |  4 +++-
 .../service/impl/DisasterInfoServiceImpl.java      | 12 +++++++++++-
 5 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index f36c883..4e563b1 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -16,6 +16,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -103,7 +104,18 @@ public class DisasterInfoController {
 	 */
 	@GetMapping("/disasterStatistics")
 	public R<List<GroupByUse>> getDisasterStatistics(String name) {
-		return R.data(disasterInfoService.getDisasterStatistics(name));
+		List<GroupByUse> groupByUseList = new ArrayList<>();
+		if("searchSponsorOrganization".equals(name)){
+			//发起机构方法 第三个左边栏
+			groupByUseList = disasterInfoService.getLeft3Data();
+		} else if ("searchResponseOrganization".equals(name)) {
+			//发起机构方法 第四个左边栏
+			groupByUseList = disasterInfoService.getLeft4Data();
+		}else{
+			groupByUseList = disasterInfoService.getDisasterStatistics(name);
+		}
+
+		return R.data(groupByUseList);
 	}
 
 	/**
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 ba73038..24125aa 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
@@ -37,5 +37,7 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 
 	List<UserTenantVo> getAllUser();
 
-	List<GroupByUse> getLeftData();
+	List<GroupByUse> getLeft3Data();
+
+	List<GroupByUse> getLeft4Data();
 }
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 484539d..f9e2fd5 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
@@ -84,10 +84,6 @@
         where d.respond_status=#{respondStatus}
         order by d.disaster_time desc
     </select>
-    <select id="getLeftData" resultType="com.kening.vordm.vo.GroupByUse">
-        select t.sponsor_organization as `name`, count(*) as cnt from disaster_info t GROUP BY t.sponsor_organization ORDER BY cnt desc LIMIT 3
-    </select>
-
     <select id="getAllUser" resultType="com.kening.vordm.vo.UserTenantVo">
         SELECT
             bu.organization AS organizationId,
@@ -97,5 +93,11 @@
             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 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 from guest_manage_disaster_ref t GROUP BY t.response_organization ORDER BY cnt desc LIMIT 3
+    </select>
 
 </mapper>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
index b76bfef..4c897f3 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
@@ -43,5 +43,7 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 
 	List<UserTenantVo> getAllUser();
 
-	List<GroupByUse> getLeftData();
+	List<GroupByUse> getLeft3Data();
+
+	List<GroupByUse> getLeft4Data();
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
index 6137684..60da78b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
@@ -94,8 +94,18 @@ implements DisasterInfoService {
 		return this.baseMapper.getAllUser();
 	}
 
+	@Override
+	public List<GroupByUse> getLeft3Data() {
+		return this.baseMapper.getLeft3Data();
+	}
+
+	@Override
+	public List<GroupByUse> getLeft4Data() {
+		return this.baseMapper.getLeft4Data();
+	}
+
 	public List<GroupByUse> getLeftData() {
-		return this.baseMapper.getLeftData();
+		return this.baseMapper.getLeft4Data();
 	}
 
 }