From 620d2f3acc9b0ae16d43c94a09ec861495cdac6a Mon Sep 17 00:00:00 2001 From: yyhouc <792163605@qq.com> Date: Tue, 16 May 2023 17:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4upload=20=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=82=E6=8F=90=E4=BA=A4?= =?UTF-8?q?new=20=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE=20=20=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/RemoteSensingSourceData.java | 6 ++++++ .../main/java/com/kening/vordm/mapper/EntityDataMapper.xml | 3 +++ .../kening/vordm/mapper/RemoteSensingSourceDataMapper.xml | 3 +++ .../java/com/kening/vordm/service/impl/NewsServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) 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) {