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

设备信息添加设备名称查询参数，设备趋势报警查询条件修改

Browse Source
This commit is contained in:
zhangjunwen 2024-11-05 15:12:43 +08:00
parent 3c1fc98c5e
commit a44dc9d16e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,9 @@ public class EquipInfoPageReqVO extends PageParam {
@Schema(description = "机床设备编号") @Schema(description = "机床设备编号")
private String equipNo; private String equipNo;
@Schema(description = "机床设备名称")
private String equipName;
@Schema(description = "机床状态") @Schema(description = "机床状态")
private Integer status; private Integer status;

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

@ -27,6 +27,7 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<EquipInfoDO>() return selectPage(reqVO, new LambdaQueryWrapperX<EquipInfoDO>()
.eqIfPresent(EquipInfoDO::getModelId, reqVO.getModelId()) .eqIfPresent(EquipInfoDO::getModelId, reqVO.getModelId())
.eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId()) .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId())
.likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName())
.likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo()) .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
.eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus()) .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
.groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId) .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)