提交upload 逻辑问题修复。提交new 上传数据 加入根据时间查询
This commit is contained in:
parent
c49f91c2db
commit
620d2f3acc
|
@ -204,6 +204,12 @@ public class RemoteSensingSourceData implements Serializable {
|
|||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
//开始时间
|
||||
@TableField(exist = false)
|
||||
private String startTime;
|
||||
//结束时间
|
||||
@TableField(exist = false)
|
||||
private String endTime;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -64,6 +64,9 @@
|
|||
<if test="entityData.sourceOrganization != null and entityData.sourceOrganization != ''">
|
||||
and ed.source_organization = #{entityData.sourceOrganization}
|
||||
</if>
|
||||
<if test="entityData.title != null and entityData.title != ''">
|
||||
and ed.title = concat('%',#{entityData.title},'%')
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY ed.upload_time DESC
|
||||
</select>
|
||||
|
|
|
@ -89,6 +89,9 @@
|
|||
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>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ public class NewsServiceImpl extends ServiceImpl<NewsMapper, News>
|
|||
if (CollectionUtil.isEmpty(content)) {
|
||||
return R.fail("文件内容为空!");
|
||||
}
|
||||
if (typeData < 1) {
|
||||
if (typeData == 1) {
|
||||
for (int i = 0; i < content.size(); ++i) {
|
||||
List<Object> row = (List) content.get(i);
|
||||
if (i != 0) {
|
||||
|
|
Loading…
Reference in New Issue