提交灾前灾后

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;
 
 
 }

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));
 	}
 

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>