feat(roll): 轧辊添加厂家字段支持
- 在 MesRollInfo 实体中新增 manufacturer 字段 - 在 MesRollInfoBo 中添加 manufacturer 查询条件 - 在查询逻辑中加入厂家字段的模糊匹配功能 - 在 MesRollInfoVo 中增加 manufacturer 导出映射 - 完善辊筒信息的厂家数据管理功能
This commit is contained in:
@@ -68,6 +68,9 @@ public class MesRollInfo extends BaseEntity {
|
|||||||
/** 制造日期 */
|
/** 制造日期 */
|
||||||
private Date manufactureDate;
|
private Date manufactureDate;
|
||||||
|
|
||||||
|
/** 厂家 */
|
||||||
|
private String manufacturer;
|
||||||
|
|
||||||
@TableLogic
|
@TableLogic
|
||||||
private Integer delFlag;
|
private Integer delFlag;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,5 +56,8 @@ public class MesRollInfoBo extends BaseEntity {
|
|||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
private Date manufactureDate;
|
private Date manufactureDate;
|
||||||
|
|
||||||
|
/** 厂家 */
|
||||||
|
private String manufacturer;
|
||||||
|
|
||||||
private String remark;
|
private String remark;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,6 +67,9 @@ public class MesRollInfoVo {
|
|||||||
@ExcelProperty("制造日期")
|
@ExcelProperty("制造日期")
|
||||||
private Date manufactureDate;
|
private Date manufactureDate;
|
||||||
|
|
||||||
|
@ExcelProperty("厂家")
|
||||||
|
private String manufacturer;
|
||||||
|
|
||||||
@ExcelProperty("备注")
|
@ExcelProperty("备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ public class MesRollInfoServiceImpl implements IMesRollInfoService {
|
|||||||
lqw.like(StringUtils.isNotBlank(bo.getRollNo()), MesRollInfo::getRollNo, bo.getRollNo());
|
lqw.like(StringUtils.isNotBlank(bo.getRollNo()), MesRollInfo::getRollNo, bo.getRollNo());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getRollType()), MesRollInfo::getRollType, bo.getRollType());
|
lqw.eq(StringUtils.isNotBlank(bo.getRollType()), MesRollInfo::getRollType, bo.getRollType());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), MesRollInfo::getStatus, bo.getStatus());
|
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), MesRollInfo::getStatus, bo.getStatus());
|
||||||
|
lqw.like(StringUtils.isNotBlank(bo.getManufacturer()), MesRollInfo::getManufacturer, bo.getManufacturer());
|
||||||
lqw.orderByAsc(MesRollInfo::getRollType, MesRollInfo::getRollId);
|
lqw.orderByAsc(MesRollInfo::getRollType, MesRollInfo::getRollId);
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user