feat(qc): 添加检验项目模板单位字段
- 在WmsInspectionItemTemplate实体类中新增templateUnit字段 - 在WmsInspectionItemTemplateBo业务对象中添加templateUnit属性 - 在WmsInspectionItemTemplateVo视图对象中添加templateUnit字段并配置Excel导出 - 在MyBatis映射文件中添加templateUnit字段映射 - 在查询条件中增加templateUnit的相等匹配逻辑
This commit is contained in:
@@ -36,6 +36,10 @@ public class WmsInspectionItemTemplate extends BaseEntity {
|
|||||||
* 待检项(可存储单个待检项或待检项编码,多个可拆分或用JSON)
|
* 待检项(可存储单个待检项或待检项编码,多个可拆分或用JSON)
|
||||||
*/
|
*/
|
||||||
private String inspectionItem;
|
private String inspectionItem;
|
||||||
|
/**
|
||||||
|
* 单位
|
||||||
|
*/
|
||||||
|
private String templateUnit;
|
||||||
/**
|
/**
|
||||||
* 逻辑删除标识:0=正常,1=已删
|
* 逻辑删除标识:0=正常,1=已删
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -37,6 +37,11 @@ public class WmsInspectionItemTemplateBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String inspectionItem;
|
private String inspectionItem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单位
|
||||||
|
*/
|
||||||
|
private String templateUnit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -46,6 +46,12 @@ public class WmsInspectionItemTemplateVo {
|
|||||||
@ExcelDictFormat(readConverterExp = "可=存储单个待检项或待检项编码,多个可拆分或用JSON")
|
@ExcelDictFormat(readConverterExp = "可=存储单个待检项或待检项编码,多个可拆分或用JSON")
|
||||||
private String inspectionItem;
|
private String inspectionItem;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单位
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "单位")
|
||||||
|
private String templateUnit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ public class WmsInspectionItemTemplateServiceImpl implements IWmsInspectionItemT
|
|||||||
lqw.like(StringUtils.isNotBlank(bo.getTemplateName()), WmsInspectionItemTemplate::getTemplateName, bo.getTemplateName());
|
lqw.like(StringUtils.isNotBlank(bo.getTemplateName()), WmsInspectionItemTemplate::getTemplateName, bo.getTemplateName());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getTemplateDesc()), WmsInspectionItemTemplate::getTemplateDesc, bo.getTemplateDesc());
|
lqw.eq(StringUtils.isNotBlank(bo.getTemplateDesc()), WmsInspectionItemTemplate::getTemplateDesc, bo.getTemplateDesc());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getInspectionItem()), WmsInspectionItemTemplate::getInspectionItem, bo.getInspectionItem());
|
lqw.eq(StringUtils.isNotBlank(bo.getInspectionItem()), WmsInspectionItemTemplate::getInspectionItem, bo.getInspectionItem());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getTemplateUnit()), WmsInspectionItemTemplate::getTemplateUnit, bo.getTemplateUnit());
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
<result property="templateName" column="template_name"/>
|
<result property="templateName" column="template_name"/>
|
||||||
<result property="templateDesc" column="template_desc"/>
|
<result property="templateDesc" column="template_desc"/>
|
||||||
<result property="inspectionItem" column="inspection_item"/>
|
<result property="inspectionItem" column="inspection_item"/>
|
||||||
|
<result property="templateUnit" column="template_unit"/>
|
||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="updateBy" column="update_by"/>
|
<result property="updateBy" column="update_by"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user