From 482d7670b1a699850b7e0a3de5df714d074ae8d2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 16 四月 2026 15:06:58 +0800
Subject: [PATCH] 电视机数据修改
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index a6fae62..290e42d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -87,7 +87,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("manu_type")) {
+ if ("manu_type".equals(entry.getKey())) {
wrapper.like(entry.getKey(), val);
} else {
wrapper.eq(entry.getKey(), val);
@@ -141,13 +141,15 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
+ if (!Cools.isEmpty(condition)) {
+ wrapper.where("CAST(wrk_no AS VARCHAR(20)) LIKE {0}", "%" + condition + "%");
+ }
+ Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(1, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (WrkMastLog wrkMastLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastLog.getId());
- map.put("value", wrkMastLog.getId());
+ map.put("id", wrkMastLog.getWrkNo());
+ map.put("value", wrkMastLog.getWrkNo());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1