From 935e74b2db3d8f119ffb2776e9acd05ead7601b7 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 16 May 2026 09:43:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E9=92=A2=E5=8D=B7ID=E9=9B=86=E5=90=88=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QcInspectionTask实体类中新增coilIds字段用于存储钢卷ID集合 - 在QcInspectionTaskBo业务对象中添加coilIds属性支持 - 更新数据库映射文件将coilIds字段映射到coil_ids列 - 在查询条件构建中增加coilIds模糊匹配功能 - 在QcInspectionTaskVo视图对象中添加coilIds并配置Excel导出 --- .../main/java/com/klp/mes/qc/domain/QcInspectionTask.java | 4 ++++ .../java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java | 5 +++++ .../java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java | 6 ++++++ .../mes/qc/service/impl/QcInspectionTaskServiceImpl.java | 1 + .../src/main/resources/mapper/qc/QcInspectionTaskMapper.xml | 1 + 5 files changed, 17 insertions(+) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java index 25ebefd2..20a9ae16 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java @@ -78,6 +78,10 @@ public class QcInspectionTask extends BaseEntity { * 备注 */ private String remark; + /** + * 钢卷ID集合,多个使用英文逗号分隔 + */ + private String coilIds; /** * 删除标志(0=正常,1=已删除) */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java index 65920902..479c0e77 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java @@ -89,5 +89,10 @@ public class QcInspectionTaskBo extends BaseEntity { */ private String remark; + /** + * 钢卷ID集合,多个使用英文逗号分隔 + */ + private String coilIds; + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java index dd68d36f..fb8808bc 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java @@ -110,5 +110,11 @@ public class QcInspectionTaskVo { @ExcelProperty(value = "备注") private String remark; + /** + * 钢卷ID集合,多个使用英文逗号分隔 + */ + @ExcelProperty(value = "钢卷ID集合") + private String coilIds; + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java index f2492075..40b0958e 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java @@ -73,6 +73,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService { lqw.eq(StringUtils.isNotBlank(bo.getAuditUser()), QcInspectionTask::getAuditUser, bo.getAuditUser()); lqw.eq(bo.getAuditTime() != null, QcInspectionTask::getAuditTime, bo.getAuditTime()); lqw.eq(StringUtils.isNotBlank(bo.getResult()), QcInspectionTask::getResult, bo.getResult()); + lqw.like(StringUtils.isNotBlank(bo.getCoilIds()), QcInspectionTask::getCoilIds, bo.getCoilIds()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml index c085cf22..01664e75 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml @@ -19,6 +19,7 @@ +