root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:入库订单查询sql报错

Browse Source
This commit is contained in:
zhangzq
2023-12-26 18:24:02 +08:00
parent a596caddfe
commit 01bafbf404
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java
View File

@@ -129,9 +129,14 @@ public class LuceneLogServiceImpl implements LuceneLogService {
List<LogRepositoryDTO> list = new ArrayList<>(); List<LogRepositoryDTO> list = new ArrayList<>();
TopFieldCollector collector = TopFieldCollector.create(sort, 100000, 0); 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); 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; ScoreDoc[] scoreDocs = topDocs.scoreDocs;
for (ScoreDoc scoreDoc : scoreDocs) { for (ScoreDoc scoreDoc : scoreDocs) {
@@ -152,7 +157,7 @@ public class LuceneLogServiceImpl implements LuceneLogService {
directory.close(); directory.close();
page.addAll(list); page.addAll(list);
page.setTotal(scoreDocs.length); page.setTotal(scoreDocs.length);
res.put("total",docs.totalHits.value); res.put("total",total);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
} }

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
View File

@@ -53,9 +53,7 @@
and #{query.plan_end_time} >= der.plandeliver_date and #{query.plan_end_time} >= der.plandeliver_date
</if> </if>
</where> </where>
<if test="pageQuery.sort != null and pageQuery.sort != ''"> order by der.sale_code,seq_no
order by ${pageQuery.sort}
</if>
</select> </select>
<select id="queryAll" resultType="java.util.Map"> <select id="queryAll" resultType="java.util.Map">