From 7ad896ca241f8172386d65629de0d4409ebaec4e Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Fri, 1 Nov 2024 14:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9F=A5=E8=AF=A2=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E5=92=8C=E8=BD=B4=E6=89=BF=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/controller/equip/vo/EquipInfoRespVO.java     | 2 ++
 .../inspur/module/system/dal/mysql/equip/EquipInfoMapper.java  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java
index 060750b..dfc835b 100644
--- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java
+++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java
@@ -71,4 +71,6 @@ public class EquipInfoRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "运行状态")
+    private Integer runStatus;
 }
\ No newline at end of file
diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
index b5ab429..3681afa 100644
--- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
+++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
@@ -29,7 +29,8 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
                 .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId())
                 .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
                 .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
-                .orderByDesc(EquipInfoDO::getCreateTime));
+                .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
+        );
     }
 
     default List<EquipSelectionVO> selection(){