From 7416afb83597a00dba48e6f18e769277d22ea302 Mon Sep 17 00:00:00 2001
From: wangyinsheng <2310589501@qq.com>
Date: Thu, 26 Sep 2024 16:22:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance/controller/DataInstructController.java        | 11 ++++-------
 .../gglm/bigmodel/maintenance/service/DataRecordService.java  |  8 ++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/controller/DataInstructController.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/controller/DataInstructController.java
index 1d0dfa5..999e572 100644
--- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/controller/DataInstructController.java
+++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/controller/DataInstructController.java
@@ -50,14 +50,11 @@ public class DataInstructController {
     @ApiOperationSupport(order = 3)
     public R<IPage<DataInstructEntity>> listPage(Query query, DataInstructEntity req) {
         QueryWrapper<DataInstructEntity> wrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(req.getItemId())) {
-            wrapper.lambda().eq(DataInstructEntity::getItemId, req.getItemId());
+        if (StringUtils.isNotBlank(req.getStationName())) {
+            wrapper.lambda().like(DataInstructEntity::getStationName, req.getStationName());
         }
-        if (StringUtils.isNotBlank(req.getStationId())) {
-            wrapper.lambda().eq(DataInstructEntity::getStationId, req.getStationId());
-        }
-        if (StringUtils.isNotBlank(req.getDeviceId())) {
-            wrapper.lambda().eq(DataInstructEntity::getDeviceId, req.getDeviceId());
+        if (StringUtils.isNotBlank(req.getDeviceName())) {
+            wrapper.lambda().like(DataInstructEntity::getDeviceName, req.getDeviceName());
         }
         if (StringUtils.isNotBlank(req.getYkName())) {
             wrapper.lambda().like(DataInstructEntity::getYkName, req.getYkName());
diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataRecordService.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataRecordService.java
index a34fd0a..820dd90 100644
--- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataRecordService.java
+++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataRecordService.java
@@ -52,11 +52,11 @@ public class DataRecordService extends BaseServiceImpl<DataRecordMapper, DataRec
        if (StringUtils.isNotBlank(req.getItemId())) {
            wrapper.lambda().eq(DataRecordEntity::getItemId, req.getItemId());
        }
-       if (StringUtils.isNotBlank(req.getStationId())) {
-           wrapper.lambda().eq(DataRecordEntity::getStationId, req.getStationId());
+       if (StringUtils.isNotBlank(req.getStationName())) {
+           wrapper.lambda().like(DataRecordEntity::getStationName, req.getStationName());
        }
-       if (StringUtils.isNotBlank(req.getDeviceId())) {
-           wrapper.lambda().eq(DataRecordEntity::getDeviceId, req.getDeviceId());
+       if (StringUtils.isNotBlank(req.getDeviceName())) {
+           wrapper.lambda().like(DataRecordEntity::getDeviceName, req.getDeviceName());
        }
        if (StringUtils.isNotBlank(req.getRecordName())) {
            wrapper.lambda().like(DataRecordEntity::getRecordName, req.getRecordName());