feat(eqp): 增加设备名称和备件名称的关联查询功能
- 在多个Mapper接口中添加selectVoPagePlus方法支持分页查询 - 在XML映射文件中新增selectVoPagePlus查询语句,联查设备管理表或备件表获取设备名称/备件名称- 修改ServiceImpl中的分页查询方法调用selectVoPagePlus替换原有的selectVoPage- 在Vo类中增加equipmentName和partName字段用于展示关联信息- 更新EqpEquipmentManagementMapper.xml中eqp_equipment_type关联查询条件,过滤已删除数据 - 优化queryList方法使用selectVoPagePlus实现列表查询功能
This commit is contained in:
@@ -44,4 +44,6 @@ public class EqpEquipmentTypeVo {
|
||||
private String remark;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -64,5 +64,11 @@ public class EqpInspectedEquipmentVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
@ExcelProperty(value = "设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -64,5 +64,7 @@ public class EqpInspectionRecordVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
@ExcelProperty(value = "设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
}
|
||||
|
||||
@@ -69,4 +69,8 @@ public class EqpSparePartVo {
|
||||
private String remark;
|
||||
|
||||
|
||||
|
||||
@ExcelProperty(value = "设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
}
|
||||
|
||||
@@ -64,5 +64,8 @@ public class EqpSparePartsChangeVo {
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
@ExcelProperty(value = "备件名称")
|
||||
private String partName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user