From 91dd284a27bc8ce7703c74610f81e5797f1842c2 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 29 Dec 2023 12:48:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?opt:=20=E4=BB=A3=E7=A0=81=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/system/service/lucene/impl/LuceneServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java index 1220fd9..9e91882 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java @@ -15,8 +15,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service @@ -48,11 +50,7 @@ public class LuceneServiceImpl implements LuceneService { @Override public List getTagName() { - List res = new ArrayList<>(); - for (TagNameEnum nameEnum : TagNameEnum.values()) { - res.add(nameEnum.getTag()); - } - return res; + return Arrays.stream(TagNameEnum.values()).map(TagNameEnum::getTag).collect(Collectors.toList()); } @SneakyThrows From b4ab0d4da16ccfb4076e12d3c69f3b51130a8956 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 1 Jan 2024 20:30:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E5=8F=AB=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=B7=A5=E5=8D=95=E7=9A=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml index bc97894..a5d4009 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml @@ -125,6 +125,7 @@ WHERE w.produce_date = CURDATE() AND w.region_code = 'YZ' AND w.workorder_status IN ('1', '2', '3') + AND w.real_weight w.plan_weight ORDER BY w.workorder_status DESC, w.planproducestart_date) AS ranked WHERE row_num = 1