From b4fbb8dfc8e1642510fd1916a55fb4919d89b0d6 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 3 Jun 2026 17:21:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc/certificate):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在QcCertificate实体及相关业务对象中新增certificateType字段,用于标识出厂合格证、检测报告、质保书等证书类型。调整涉及数据库映射、查询条件及导出映射。调整前,证书记录缺少类型分类;调整后,支持按证书类型进行筛选与统计,提升证书管理能力。 --- .../src/main/java/com/klp/mes/qc/domain/QcCertificate.java | 4 ++++ .../main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java | 5 +++++ .../main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java | 6 ++++++ .../klp/mes/qc/service/impl/QcCertificateServiceImpl.java | 1 + .../src/main/resources/mapper/qc/QcCertificateMapper.xml | 1 + 5 files changed, 17 insertions(+) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java index 20c7cca6..1c48dcc7 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java @@ -70,6 +70,10 @@ public class QcCertificate extends BaseEntity { * 质保证明说明(注释) */ private String note; + /** + * 证书类型(如:出厂合格证、检测报告、质保书等) + */ + private String certificateType; /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java index 17a25b5e..66e0508c 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java @@ -82,6 +82,11 @@ public class QcCertificateBo extends BaseEntity { */ private String note; + /** + * 证书类型(如:出厂合格证、检测报告、质保书等) + */ + private String certificateType; + /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java index e1ca5b1e..36d9bbb6 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java @@ -100,5 +100,11 @@ public class QcCertificateVo { @ExcelProperty(value = "备注") private String remark; + /** + * 证书类型(如:出厂合格证、检测报告、质保书等) + */ + @ExcelProperty(value = "证书类型") + private String certificateType; + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java index 6277b674..e68d9291 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java @@ -75,6 +75,7 @@ public class QcCertificateServiceImpl implements IQcCertificateService { lqw.le(bo.getApproveTimeEnd() != null, QcCertificate::getApproveTime, bo.getApproveTimeEnd()); lqw.eq(StringUtils.isNotBlank(bo.getNote()), QcCertificate::getNote, bo.getNote()); + lqw.eq(StringUtils.isNotBlank(bo.getCertificateType()), QcCertificate::getCertificateType, bo.getCertificateType()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml index 181e1b25..818dc0dd 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml @@ -18,6 +18,7 @@ +