From c13e038991c3e110316869cdff058e811025d2f9 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Mon, 24 Apr 2023 15:49:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kening/vordm/entity/EntityData.java    | 18 ++++++++++++++++++
 .../kening/vordm/mapper/EntityDataMapper.xml   |  8 ++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
index 67849b1..985f1d9 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
@@ -114,6 +114,24 @@ public class EntityData implements Serializable {
 	@TableField(exist = false)
 	private String uploaderName;
 
+	/**
+	 * 图层名称
+	 */
+	@TableField(exist = false)
+	private String layerName;
+
+	/**
+	 * vordmId
+	 */
+	@TableField(exist = false)
+	private String vordmId;
+
+	/**
+	 * 图层名称
+	 */
+	@TableField(exist = false)
+	private String msName;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
index cb58f2f..78bf371 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
@@ -35,9 +35,13 @@
     <select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
         select
         <include refid="Base_Column_List"/>,
-               gi.username AS uploaderName
+               gi.username AS uploaderName,
+               ms.layer_name,
+               ms.vordm_id,
+               ms.name AS msName
         from entity_data ed
-        left join guest_info gi on gi.id = ed.uploader_id
+        inner join guest_info gi on gi.id = ed.uploader_id
+            inner join map_server ms on ms.disaster_id = ed.disaster_id
         <where>
             <if test="entityData.disasterId != null and entityData.disasterId != ''">
                 ed.disaster_id = #{entityData.disasterId}

From c0206ad1c229b12ddf9be477f11f7f0dca799a86 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Mon, 24 Apr 2023 16:39:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/kening/vordm/vo/UserVo.java |  5 +++
 .../controller/DisasterInfoController.java    |  5 ++-
 .../kening/vordm/mapper/GuestInfoMapper.java  | 12 +++++-
 .../kening/vordm/mapper/GuestInfoMapper.xml   | 42 +++++++++++++++++++
 .../vordm/service/DisasterInfoService.java    |  2 +
 .../service/impl/DisasterInfoServiceImpl.java | 18 ++++++++
 6 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
index e7013f2..51ce028 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java
@@ -89,4 +89,9 @@ public class UserVo {
 
 	//国家
 	private String country;
+
+	private Integer byUserStatisticsOne;
+	private Integer byUserStatisticsTwo;
+	private Integer byUserStatisticsThree;
+	private Integer byUserStatisticsFour;
 }
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 b8b7595..1dfb97b 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
@@ -410,5 +410,8 @@ public class DisasterInfoController {
 		return R.data(disasterInfoService.updateById(disasterInfo));
 	}
 
-
+	@GetMapping("/getByUserDisasterInfoStatistics")
+	public R getByUserDisasterInfo(Long userId) {
+		return R.data(disasterInfoService.getByUserDisasterInfoStatistics(userId));
+	}
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java
index f1309af..c32cf69 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java
@@ -17,7 +17,15 @@ public interface GuestInfoMapper extends BaseMapper<GuestInfo> {
 
     UserVo getBladeUserByEmail(@Param("email") String email);
 
-	int updatePassword(String email, String password);
+	int updatePassword(@Param("email") String email,@Param("password") String password);
 
-    int updateAccount(UserVo userVo);
+    int updateAccount(@Param("userVo") UserVo userVo);
+
+	int getByUserStatisticsOne(@Param("userId") Long userId);
+
+	int getByUserStatisticsTwo(@Param("userId") Long userId);
+
+	int getByUserStatisticsThree(@Param("userId") Long userId);
+
+	int getByUserStatisticsFour(@Param("userId") Long userId);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
index c2d8902..41dd933 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
@@ -39,4 +39,46 @@
             email = #{email}
         </where>
     </select>
+    <select id="getByUserStatisticsOne" resultType="java.lang.Integer">
+        select count(di.id)
+        FROM disaster_info di
+        inner join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
+        inner join guest_info gi on gi.id = gmdr.sponsor_id
+        inner join blade_user bu on bu.email = gi.email
+        <where>
+            bu.id = #{userId}
+            and di.respond_status = 3
+        </where>
+    </select>
+
+    <select id="getByUserStatisticsTwo" resultType="java.lang.Integer">
+        select count(di.id)
+        FROM disaster_info di
+        inner join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id
+        inner join guest_info gi on gi.id = gmdr.sponsor_id
+        inner join blade_user bu on bu.email = gi.email
+        <where>
+            bu.id = #{userId}
+            and di.respond_status = 2
+        </where>
+
+    </select>
+
+    <select id="getByUserStatisticsThree" resultType="java.lang.Integer">
+        select count(ed.id)
+        FROM entity_data ed
+        <where>
+            ed.manager_id = #{userId}
+        </where>
+    </select>
+
+    <select id="getByUserStatisticsFour" resultType="java.lang.Integer">
+        select count(ed.id)
+        FROM entity_data ed
+        left join guest_manage_disaster_ref gmdr on gmdr.disaster_id = ed.disaster_id
+        <where>
+            gmdr.manager_id = #{userId}
+            and ed.manager_id = null
+        </where>
+    </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 9793fa6..a2e93f6 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
@@ -70,4 +70,6 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 	UserVo getBladeUserByEmail(String email);
 
 	Integer getByUserDisasterInfo(Long userId, Long disasterId);
+
+	UserVo getByUserDisasterInfoStatistics(Long userId);
 }
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 70e994e..c05023b 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
@@ -217,6 +217,24 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 		return guestManageDisasterRefService.count(queryWrapper);
 	}
 
+	@Override
+	public UserVo getByUserDisasterInfoStatistics(Long userId) {
+		//已响应
+		int byUserStatisticsOne = guestInfoMapper.getByUserStatisticsOne(userId);
+		//正在响应
+		int byUserStatisticsTwo = guestInfoMapper.getByUserStatisticsTwo(userId);
+		//已审核数据数量
+		int byUserStatisticsThree = guestInfoMapper.getByUserStatisticsThree(userId);
+		//待审核数据数量
+		int byUserStatisticsFour = guestInfoMapper.getByUserStatisticsFour(userId);
+		UserVo userVo = new UserVo();
+		userVo.setByUserStatisticsOne(byUserStatisticsOne);
+		userVo.setByUserStatisticsTwo(byUserStatisticsTwo);
+		userVo.setByUserStatisticsThree(byUserStatisticsThree);
+		userVo.setByUserStatisticsFour(byUserStatisticsFour);
+		return userVo;
+	}
+
 	/**
 	 * 后台管理系统-控制台灾害各项统计
 	 * @description 暂时没有条件查询 所有统计都暂时写在一个查询里面