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} - - and r.product_time between #{remoteSensingSourceData.startTime} and #{remoteSensingSourceData.endTime} + + and r.product_time >= (select + disaster_time + from disaster_info where id = #{remoteSensingSourceData.disasterId}) + + + and r.product_time < (select + disaster_time + from disaster_info where id = #{remoteSensingSourceData.disasterId})