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 { .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 selection(){