From 0ff927605ae5df1cb63fbe6cb838c35da43be8ac Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期一, 11 十一月 2024 10:58:14 +0800 Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp --- src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 2 +- src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java index 18edf8c..359a5e2 100644 --- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java +++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java @@ -123,7 +123,7 @@ public R query(String condition) { EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>(); wrapper.like("io_desc", condition); - Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 10), wrapper); + Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 30), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (BasWrkIotype basWrkIotype : page.getRecords()){ Map<String, Object> map = new HashMap<>(); diff --git a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java index 7a4b06b..6cb8f60 100644 --- a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java +++ b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java @@ -55,7 +55,12 @@ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); } else { - wrapper.like(entry.getKey(), val); + if (entry.getKey().equals("io_type")) { + wrapper.eq(entry.getKey(), val); + } else { + wrapper.like(entry.getKey(), val); + } + } } } -- Gitblit v1.9.1