TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'zjw'

Browse Source
This commit is contained in:
zhangjunwen 2024-11-01 14:32:48 +08:00
commit 738d691042
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java
View File

@ -71,4 +71,6 @@ public class EquipInfoRespVO {
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime; private LocalDateTime createTime;
@Schema(description = "运行状态")
private Integer runStatus;
} }

3
imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
View File

@ -29,7 +29,8 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
.eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId()) .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId())
.likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo()) .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
.eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus()) .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
.orderByDesc(EquipInfoDO::getCreateTime)); .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
);
} }
default List<EquipSelectionVO> selection(){ default List<EquipSelectionVO> selection(){