From 6305b9687131c2ef0aa97635dabc54b3a1142688 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Wed, 29 May 2024 12:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=BE=E5=A4=87=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=91=E5=A2=9E=E5=8A=A0=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/EquipMaintenanceRecordPageReqVO.java                   | 4 ++++
 .../equipmaintenancerecord/EquipMaintenanceRecordMapper.java  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/equipmaintenancerecord/vo/EquipMaintenanceRecordPageReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/equipmaintenancerecord/vo/EquipMaintenanceRecordPageReqVO.java
index a779f964..edd892b3 100644
--- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/equipmaintenancerecord/vo/EquipMaintenanceRecordPageReqVO.java
+++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/equipmaintenancerecord/vo/EquipMaintenanceRecordPageReqVO.java
@@ -27,9 +27,13 @@ public class EquipMaintenanceRecordPageReqVO extends PageParam {
     @Schema(description = "设备id", example = "12621")
     private Long equipId;
 
+    @Schema(description = "车间id", example = "12621")
+    private Long workshopId;
+
     @Schema(description = "描述", example = "随便")
     private String description;
 
+
     @Schema(description = "维保人")
     private Long owner;
 
diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/equipmaintenancerecord/EquipMaintenanceRecordMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/equipmaintenancerecord/EquipMaintenanceRecordMapper.java
index 3e057cbb..8a52f5ca 100644
--- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/equipmaintenancerecord/EquipMaintenanceRecordMapper.java
+++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/equipmaintenancerecord/EquipMaintenanceRecordMapper.java
@@ -45,6 +45,7 @@ public interface EquipMaintenanceRecordMapper extends BaseMapperX<EquipMaintenan
                 .eqIfPresent(EquipMaintenanceRecordDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(EquipMaintenanceRecordDO::getCreateTime, reqVO.getCreateTime())
                 .betweenIfPresent(EquipMaintenanceRecordDO::getSubmitTime, reqVO.getSubmitTime())
+                .eq(reqVO.getWorkshopId()!=null,WorkshopDO::getId,reqVO.getWorkshopId())
                 ;
 
         return selectPage(reqVO, query);