feat(qc): 添加质检检验任务所属单位字段
- 在QcInspectionTask实体类中新增belongCompany字段 - 在QcInspectionTaskBo业务对象中新增belongCompany字段 - 在QcInspectionTaskVo视图对象中新增belongCompany字段并配置Excel导出 - 在MyBatis映射文件中添加belongCompany字段映射 - 在查询条件中添加所属单位模糊匹配功能
This commit is contained in:
@@ -34,6 +34,10 @@ public class QcInspectionTask extends BaseEntity {
|
|||||||
* 任务类型(内控/产品检验)
|
* 任务类型(内控/产品检验)
|
||||||
*/
|
*/
|
||||||
private String taskType;
|
private String taskType;
|
||||||
|
/**
|
||||||
|
* 所属单位
|
||||||
|
*/
|
||||||
|
private String belongCompany;
|
||||||
/**
|
/**
|
||||||
* 来源类型(生产/采购/库存)
|
* 来源类型(生产/采购/库存)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -34,6 +34,11 @@ public class QcInspectionTaskBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String taskType;
|
private String taskType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 所属单位
|
||||||
|
*/
|
||||||
|
private String belongCompany;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 来源类型(生产/采购/库存)
|
* 来源类型(生产/采购/库存)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -43,6 +43,12 @@ public class QcInspectionTaskVo {
|
|||||||
@ExcelDictFormat(readConverterExp = "内=控/产品检验")
|
@ExcelDictFormat(readConverterExp = "内=控/产品检验")
|
||||||
private String taskType;
|
private String taskType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 所属单位
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "所属单位")
|
||||||
|
private String belongCompany;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 来源类型(生产/采购/库存)
|
* 来源类型(生产/采购/库存)
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -123,6 +123,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService {
|
|||||||
LambdaQueryWrapper<QcInspectionTask> lqw = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<QcInspectionTask> lqw = Wrappers.lambdaQuery();
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getTaskCode()), QcInspectionTask::getTaskCode, bo.getTaskCode());
|
lqw.eq(StringUtils.isNotBlank(bo.getTaskCode()), QcInspectionTask::getTaskCode, bo.getTaskCode());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), QcInspectionTask::getTaskType, bo.getTaskType());
|
lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), QcInspectionTask::getTaskType, bo.getTaskType());
|
||||||
|
lqw.like(StringUtils.isNotBlank(bo.getBelongCompany()), QcInspectionTask::getBelongCompany, bo.getBelongCompany());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getSourceType()), QcInspectionTask::getSourceType, bo.getSourceType());
|
lqw.eq(StringUtils.isNotBlank(bo.getSourceType()), QcInspectionTask::getSourceType, bo.getSourceType());
|
||||||
lqw.eq(bo.getSourceId() != null, QcInspectionTask::getSourceId, bo.getSourceId());
|
lqw.eq(bo.getSourceId() != null, QcInspectionTask::getSourceId, bo.getSourceId());
|
||||||
lqw.eq(bo.getSchemeId() != null, QcInspectionTask::getSchemeId, bo.getSchemeId());
|
lqw.eq(bo.getSchemeId() != null, QcInspectionTask::getSchemeId, bo.getSchemeId());
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
<result property="taskId" column="task_id"/>
|
<result property="taskId" column="task_id"/>
|
||||||
<result property="taskCode" column="task_code"/>
|
<result property="taskCode" column="task_code"/>
|
||||||
<result property="taskType" column="task_type"/>
|
<result property="taskType" column="task_type"/>
|
||||||
|
<result property="belongCompany" column="belong_company"/>
|
||||||
<result property="sourceType" column="source_type"/>
|
<result property="sourceType" column="source_type"/>
|
||||||
<result property="sourceId" column="source_id"/>
|
<result property="sourceId" column="source_id"/>
|
||||||
<result property="schemeId" column="scheme_id"/>
|
<result property="schemeId" column="scheme_id"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user