From d1a3901af18036b5a1b1ae20a0e0614dccc50f4a Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Thu, 25 May 2023 16:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=81=BE=E5=89=8D=E7=81=BE?=
 =?UTF-8?q?=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kening/vordm/entity/RemoteSensingSourceData.java  |  3 +++
 .../controller/RemoteSensingSourceDataController.java |  1 +
 .../vordm/mapper/RemoteSensingSourceDataMapper.xml    | 11 +++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java
index f61fa97..6014e0b 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java
@@ -210,6 +210,9 @@ public class RemoteSensingSourceData implements Serializable {
 	//结束时间
 	@TableField(exist = false)
 	private String endTime;
+	//标志灾前灾后字段 0-灾前，1-灾后
+	@TableField(exist = false)
+	private Integer beforeOrAfter =1;
 
 
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
index a524b69..3a1cc45 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
@@ -55,6 +55,7 @@ public class RemoteSensingSourceDataController {
 		if (optionsJson != null) {
 			remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
 		}
+
 		return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
 	}
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml
index 1027544..b8e3af0 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml
@@ -89,8 +89,15 @@
                          open="(" separator="," close=")">#{AList}
                 </foreach>
             </if>
-            <if test="remoteSensingSourceData.startTime != null and remoteSensingSourceData.startTime != '' and remoteSensingSourceData.endTime != null and remoteSensingSourceData.endTime != '' ">
-                and r.product_time between #{remoteSensingSourceData.startTime} and #{remoteSensingSourceData.endTime}
+            <if test="remoteSensingSourceData.beforeOrAfter == 1">
+                and r.product_time &gt;= (select
+                disaster_time
+                from disaster_info where id = #{remoteSensingSourceData.disasterId})
+            </if>
+            <if test="remoteSensingSourceData.beforeOrAfter == 0">
+                and r.product_time &lt; (select
+                disaster_time
+                from disaster_info where id = #{remoteSensingSourceData.disasterId})
             </if>
         </where>
     </select>