From 529caef00da7f70c6fe74a171b26fc017c141577 Mon Sep 17 00:00:00 2001
From: nihaotian <q756741434@163.com>
Date: Fri, 26 Jul 2024 08:57:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/kening/vordm/controller/ToolController.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
index 6981c18..efd377e 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
@@ -57,6 +57,9 @@ public class ToolController{
 		if(!StringUtils.isEmpty(tool.getRelatedDisasterType())) {
 			queryWrapper.eq("related_disaster_type", tool.getRelatedDisasterType());
 		}
+		if(!StringUtils.isEmpty(tool.getDisasterType())) {
+			queryWrapper.like("disaster_type", tool.getDisasterType());
+		}
 		String checkd = tool.getChecked();
 		if(checkd != null && checkd.equals("1")){
 			queryWrapper.isNull("review_time");

From 1393e2b840433dd203637dde6e09edd0af2e9f5c Mon Sep 17 00:00:00 2001
From: nihaotian <q756741434@163.com>
Date: Thu, 8 Aug 2024 16:29:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kening/vordm/controller/DisasterInfoController.java | 6 ++++++
 .../java/com/kening/vordm/mapper/DisasterInfoMapper.java    | 2 ++
 .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml     | 5 +++++
 .../java/com/kening/vordm/service/DisasterInfoService.java  | 2 ++
 .../kening/vordm/service/impl/DisasterInfoServiceImpl.java  | 5 +++++
 5 files changed, 20 insertions(+)

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 b24104c..fb4d047 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
@@ -855,4 +855,10 @@ public class DisasterInfoController {
 		return R.data(disasterInfoService.getUserDisasterInfoListNew(Condition.getPage(query), params.get("userId"),params.get("roleId")));
 	}
 
+	//home页面 受影响国家统计
+	@GetMapping("/getAffectedCountryCount")
+	public R<Integer> getAffectedCountryCount() {
+		return R.data(disasterInfoService.getAffectedCountryCount());
+	}
+
 }
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 14a31cd..a574f65 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
@@ -117,4 +117,6 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 	IPage<DisasterInfo> getUserDisasterInfoListNew(IPage<Object> page, @Param("userId")  String userId);
 
 	void updateApplyForCount(@Param("id") Long id);
+
+    Integer getAffectedCountryCount();
 }
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 da2b70b..0f5d957 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
@@ -1720,4 +1720,9 @@
              id=#{id}
         </where>
     </update>
+
+    <select id="getAffectedCountryCount" resultType="java.lang.Integer">
+        SELECT count(*) FROM
+                (SELECT disaster_country FROM `disaster_info` GROUP BY disaster_country) disaster
+    </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 06fecf3..ac0c502 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
@@ -98,4 +98,6 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 	IPage<DisasterInfo> getUserDisasterInfoListNew(IPage<Object> page, String userId, String roleId);
 
 	void updateApplyForCount(Long disasterId);
+
+	Integer getAffectedCountryCount();
 }
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 657fbdd..fd45700 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
@@ -626,4 +626,9 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 	public void updateApplyForCount(Long disasterId) {
 		baseMapper.updateApplyForCount(disasterId);
 	}
+
+	@Override
+	public Integer getAffectedCountryCount() {
+		return baseMapper.getAffectedCountryCount();
+	}
 }