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 ea87d61..f61fa97 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 @@ -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; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index 21347b9..6860241 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -64,6 +64,9 @@ and ed.source_organization = #{entityData.sourceOrganization} + + and ed.title = concat('%',#{entityData.title},'%') + ORDER BY ed.upload_time DESC 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 4145c09..1027544 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,6 +89,9 @@ open="(" separator="," close=")">#{AList} + + and r.product_time between #{remoteSensingSourceData.startTime} and #{remoteSensingSourceData.endTime} + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java index aab7d56..3d0e894 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java @@ -92,7 +92,7 @@ public class NewsServiceImpl extends ServiceImpl if (CollectionUtil.isEmpty(content)) { return R.fail("文件内容为空!"); } - if (typeData < 1) { + if (typeData == 1) { for (int i = 0; i < content.size(); ++i) { List row = (List) content.get(i); if (i != 0) {