From 01bafbf404aaf4c98acd53f3b5b47bd32b7e1638 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 26 Dec 2023 18:24:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=85=A5=E5=BA=93=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logging/service/impl/LuceneLogServiceImpl.java | 11 ++++++++--- .../service/dao/mapper/xml/MpsSaleOrderMapper.xml | 4 +--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java index 680758df..98626d01 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java @@ -129,9 +129,14 @@ public class LuceneLogServiceImpl implements LuceneLogService { List list = new ArrayList<>(); TopFieldCollector collector = TopFieldCollector.create(sort, 100000, 0); - searcher.search(booleanQueryBuilder.build(), collector); + BooleanQuery build = booleanQueryBuilder.build(); + searcher.search(build, collector); TopDocs topDocs = collector.topDocs(pageNum*pageSize, pageSize); - docs = searcher.search(booleanQueryBuilder.build(),1); + long total = open.numDocs(); + if (build.clauses().size()>2){ + docs = searcher.search(build,1); + total = docs.totalHits.value; + } ScoreDoc[] scoreDocs = topDocs.scoreDocs; for (ScoreDoc scoreDoc : scoreDocs) { @@ -152,7 +157,7 @@ public class LuceneLogServiceImpl implements LuceneLogService { directory.close(); page.addAll(list); page.setTotal(scoreDocs.length); - res.put("total",docs.totalHits.value); + res.put("total",total); }catch (Exception ex){ ex.printStackTrace(); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml index a9504d7d..76087d87 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml @@ -53,9 +53,7 @@ and #{query.plan_end_time} >= der.plandeliver_date - - order by ${pageQuery.sort} - + order by der.sale_code,seq_no