From fda7574e46d781c215f5ae1da0209c865e4075aa Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Wed, 12 Apr 2023 10:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kening/vordm/controller/DisasterInfoController.java  | 4 ++--
 .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 5 ++---
 2 files changed, 4 insertions(+), 5 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 b57c59a..524ec25 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
@@ -227,7 +227,7 @@ public class DisasterInfoController {
 	 *
 	 */
 	@PostMapping("Call-for-help")
-	public  R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo){
+	public  R<Boolean> insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo ){
 		GuestInfo guestInfo = new GuestInfo();
 		BeanUtil.copyProperties(callForHelpVo, guestInfo);
 		guestInfo.setId(IdWorker.getId());
@@ -252,7 +252,7 @@ public class DisasterInfoController {
 	public R<Boolean> review( String  id){
 		DisasterInfo disasterInfo = new DisasterInfo();
 		disasterInfo.setId(Long.valueOf(id));
-		disasterInfo.setRespondStatus(1);
+		disasterInfo.setRespondStatus(2);
 		Boolean flag=disasterInfoService.updateById(disasterInfo);
 		return R.data(flag);
 	}
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 e3f5f1d..fa313e0 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
@@ -137,6 +137,7 @@
             guest_info u  on  u.id = ud.sponsor_id JOIN
             disaster_info d on  d.id = ud.disaster_id
         <where>
+            d.respond_status = #{callForHelpVo.respondStatus}
             <if test="callForHelpVo.disasterType != null and callForHelpVo.disasterType != ''">
                 d.disaster_type = #{callForHelpVo.disasterType}
             </if>
@@ -152,9 +153,7 @@
             <if test="callForHelpVo.uploadTime != null and callForHelpVo.uploadTime != ''">
                 and d.upload_time = #{callForHelpVo.uploadTime}
             </if>
-            <if test="callForHelpVo.geometry != null and callForHelpVo.geometry != ''">
-                and d.geometry = #{callForHelpVo.geometry}
-            </if>
         </where>
+    order by d.upload_time desc
     </select>
 </mapper>