提交灾前灾后
This commit is contained in:
parent
e55cd6430b
commit
d1a3901af1
|
@ -210,6 +210,9 @@ public class RemoteSensingSourceData implements Serializable {
|
||||||
//结束时间
|
//结束时间
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String endTime;
|
private String endTime;
|
||||||
|
//标志灾前灾后字段 0-灾前,1-灾后
|
||||||
|
@TableField(exist = false)
|
||||||
|
private Integer beforeOrAfter =1;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,7 @@ public class RemoteSensingSourceDataController {
|
||||||
if (optionsJson != null) {
|
if (optionsJson != null) {
|
||||||
remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
|
remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
|
return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -89,8 +89,15 @@
|
||||||
open="(" separator="," close=")">#{AList}
|
open="(" separator="," close=")">#{AList}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
<if test="remoteSensingSourceData.startTime != null and remoteSensingSourceData.startTime != '' and remoteSensingSourceData.endTime != null and remoteSensingSourceData.endTime != '' ">
|
<if test="remoteSensingSourceData.beforeOrAfter == 1">
|
||||||
and r.product_time between #{remoteSensingSourceData.startTime} and #{remoteSensingSourceData.endTime}
|
and r.product_time >= (select
|
||||||
|
disaster_time
|
||||||
|
from disaster_info where id = #{remoteSensingSourceData.disasterId})
|
||||||
|
</if>
|
||||||
|
<if test="remoteSensingSourceData.beforeOrAfter == 0">
|
||||||
|
and r.product_time < (select
|
||||||
|
disaster_time
|
||||||
|
from disaster_info where id = #{remoteSensingSourceData.disasterId})
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
Loading…
Reference in New Issue