From c2f6e6f7c2b38076cd6ff84d17dac6410404262b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 18 May 2026 11:42:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?= =?UTF-8?q?=E4=BF=9D=E8=AF=81=E4=B9=A6=E5=AE=A1=E6=89=B9=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=92=8C=E9=92=A2=E5=8D=B7ID=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QcCertificate实体中新增审批状态、审批人、审批时间字段 - 在QcCertificateBo业务对象中添加审批相关字段和时间范围查询功能 - 为QcCertificateItem、QcChemicalItem、QcPhysicalItem等项目表添加钢卷ID字段 - 更新对应的Mapper XML文件映射关系 - 在服务实现类中添加审批字段和钢卷ID的查询条件支持 - 在VO类中添加Excel导出相关的审批字段注解 - 集成DateTimeFormat注解支持审批时间格式化处理 --- .../com/klp/mes/qc/domain/QcCertificate.java | 12 +++++++ .../klp/mes/qc/domain/QcCertificateItem.java | 4 +++ .../com/klp/mes/qc/domain/QcChemicalItem.java | 4 +++ .../com/klp/mes/qc/domain/QcPhysicalItem.java | 4 +++ .../klp/mes/qc/domain/bo/QcCertificateBo.java | 33 +++++++++++++++++++ .../mes/qc/domain/bo/QcCertificateItemBo.java | 5 +++ .../mes/qc/domain/bo/QcChemicalItemBo.java | 5 +++ .../mes/qc/domain/bo/QcPhysicalItemBo.java | 5 +++ .../mes/qc/domain/vo/QcCertificateItemVo.java | 5 +++ .../klp/mes/qc/domain/vo/QcCertificateVo.java | 18 ++++++++++ .../mes/qc/domain/vo/QcChemicalItemVo.java | 5 +++ .../mes/qc/domain/vo/QcPhysicalItemVo.java | 6 ++++ .../impl/QcCertificateItemServiceImpl.java | 1 + .../impl/QcCertificateServiceImpl.java | 6 ++++ .../impl/QcChemicalItemServiceImpl.java | 1 + .../impl/QcPhysicalItemServiceImpl.java | 1 + .../mapper/qc/QcCertificateItemMapper.xml | 1 + .../mapper/qc/QcCertificateMapper.xml | 3 ++ .../mapper/qc/QcChemicalItemMapper.xml | 1 + .../mapper/qc/QcPhysicalItemMapper.xml | 1 + 20 files changed, 121 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 bb8e353d..20c7cca6 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 @@ -54,6 +54,18 @@ public class QcCertificate extends BaseEntity { * 签发日期 */ private Date issueDate; + /** + * 审批状态（待提交/审批中/已通过/已驳回） + */ + private String approveStatus; + /** + * 审批人 + */ + private String approveBy; + /** + * 审批时间 + */ + private Date approveTime; /** * 质保证明说明（注释） */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java index 9c6b4bff..fd1de914 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java @@ -29,6 +29,10 @@ public class QcCertificateItem extends BaseEntity { * 证书ID */ private Long certificateId; + /** + * 钢卷ID + */ + private Long coilId; /** * 钢卷号 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java index e4ee9c0f..f47e50f2 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java @@ -29,6 +29,10 @@ public class QcChemicalItem extends BaseEntity { * 证书ID */ private Long certificateId; + /** + * 钢卷ID + */ + private Long coilId; /** * 钢卷号 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java index 245132dc..8cb93679 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java @@ -29,6 +29,10 @@ public class QcPhysicalItem extends BaseEntity { * 证书ID */ private Long certificateId; + /** + * 钢卷ID + */ + private Long coilId; /** * 钢卷号(关联化学成分表) */ 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 7b5e953c..17a25b5e 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 @@ -7,6 +7,7 @@ import javax.validation.constraints.*; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 质量证明书主业务对象 qc_certificate @@ -59,6 +60,23 @@ public class QcCertificateBo extends BaseEntity { */ private Date issueDate; + /** + * 审批状态（待提交/审批中/已通过/已驳回） + */ + private String approveStatus; + + /** + * 审批人 + */ + private String approveBy; + + /** + * 审批时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date approveTime; + /** * 质保证明说明（注释） */ @@ -69,5 +87,20 @@ public class QcCertificateBo extends BaseEntity { */ private String remark; + /** + * 审批时间范围查询：查询审批时间在指定范围内的记录 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date approveTimeStart; + + /** + * 审批时间结束 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date approveTimeEnd; + + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java index ff0005d8..40674592 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java @@ -28,6 +28,11 @@ public class QcCertificateItemBo extends BaseEntity { */ private Long certificateId; + /** + * 钢卷ID + */ + private Long coilId; + /** * 钢卷号 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java index 67e2e7cb..48a310da 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java @@ -28,6 +28,11 @@ public class QcChemicalItemBo extends BaseEntity { */ private Long certificateId; + /** + * 钢卷ID + */ + private Long coilId; + /** * 钢卷号 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java index 3b23a314..e0e2e945 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java @@ -28,6 +28,11 @@ public class QcPhysicalItemBo extends BaseEntity { */ private Long certificateId; + /** + * 钢卷ID + */ + private Long coilId; + /** * 钢卷号(关联化学成分表) */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java index a241bd99..8fa91582 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java @@ -32,6 +32,11 @@ public class QcCertificateItemVo { @ExcelProperty(value = "证书ID") private Long certificateId; + /** + * 钢卷ID + */ + private Long coilId; + /** * 钢卷号 */ 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 ae701b0d..e1ca5b1e 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 @@ -69,6 +69,24 @@ public class QcCertificateVo { @ExcelProperty(value = "签发日期") private Date issueDate; + /** + * 审批状态（待提交/审批中/已通过/已驳回） + */ + @ExcelProperty(value = "审批状态") + private String approveStatus; + + /** + * 审批人 + */ + @ExcelProperty(value = "审批人") + private String approveBy; + + /** + * 审批时间 + */ + @ExcelProperty(value = "审批时间") + private Date approveTime; + /** * 质保证明说明（注释） */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java index df27018b..3bef5f0e 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java @@ -32,6 +32,11 @@ public class QcChemicalItemVo { @ExcelProperty(value = "证书ID") private Long certificateId; + /** + * 钢卷ID + */ + private Long coilId; + /** * 钢卷号 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java index 0706f277..fd3b080e 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java @@ -32,6 +32,12 @@ public class QcPhysicalItemVo { @ExcelProperty(value = "证书ID") private Long certificateId; + /** + * 钢卷ID + */ + @ExcelProperty(value = "钢卷ID") + private Long coilId; + /** * 钢卷号(关联化学成分表) */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java index 44fcb150..0c68347f 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java @@ -62,6 +62,7 @@ public class QcCertificateItemServiceImpl implements IQcCertificateItemService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCertificateId() != null, QcCertificateItem::getCertificateId, bo.getCertificateId()); + lqw.eq(bo.getCoilId() != null, QcCertificateItem::getCoilId, bo.getCoilId()); lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcCertificateItem::getCoilNo, bo.getCoilNo()); lqw.eq(StringUtils.isNotBlank(bo.getHeatNo()), QcCertificateItem::getHeatNo, bo.getHeatNo()); lqw.eq(StringUtils.isNotBlank(bo.getMaterialType()), QcCertificateItem::getMaterialType, bo.getMaterialType()); 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 2ba5c1ca..6277b674 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 @@ -68,6 +68,12 @@ public class QcCertificateServiceImpl implements IQcCertificateService { lqw.eq(StringUtils.isNotBlank(bo.getConsignee()), QcCertificate::getConsignee, bo.getConsignee()); lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), QcCertificate::getManufacturer, bo.getManufacturer()); lqw.eq(bo.getIssueDate() != null, QcCertificate::getIssueDate, bo.getIssueDate()); + lqw.eq(StringUtils.isNotBlank(bo.getApproveStatus()), QcCertificate::getApproveStatus, bo.getApproveStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getApproveBy()), QcCertificate::getApproveBy, bo.getApproveBy()); + // 根据审批时间范围筛选 + lqw.ge(bo.getApproveTimeStart() != null, QcCertificate::getApproveTime, bo.getApproveTimeStart()); // 开始时间不为空则进行筛选 + lqw.le(bo.getApproveTimeEnd() != null, QcCertificate::getApproveTime, bo.getApproveTimeEnd()); + lqw.eq(StringUtils.isNotBlank(bo.getNote()), QcCertificate::getNote, bo.getNote()); return lqw; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java index 6b98a3e3..7d737844 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java @@ -62,6 +62,7 @@ public class QcChemicalItemServiceImpl implements IQcChemicalItemService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCertificateId() != null, QcChemicalItem::getCertificateId, bo.getCertificateId()); + lqw.eq(bo.getCoilId() != null, QcChemicalItem::getCoilId, bo.getCoilId()); lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcChemicalItem::getCoilNo, bo.getCoilNo()); lqw.eq(StringUtils.isNotBlank(bo.getHeatNo()), QcChemicalItem::getHeatNo, bo.getHeatNo()); lqw.eq(bo.getC() != null, QcChemicalItem::getC, bo.getC()); diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java index ca8acfb9..5e5ca874 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java @@ -62,6 +62,7 @@ public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCertificateId() != null, QcPhysicalItem::getCertificateId, bo.getCertificateId()); + lqw.eq(bo.getCoilId() != null, QcPhysicalItem::getCoilId, bo.getCoilId()); lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcPhysicalItem::getCoilNo, bo.getCoilNo()); lqw.eq(bo.getYieldStrength() != null, QcPhysicalItem::getYieldStrength, bo.getYieldStrength()); lqw.eq(bo.getTensileStrength() != null, QcPhysicalItem::getTensileStrength, bo.getTensileStrength()); diff --git a/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml index e32f6d58..6974af5a 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml @@ -7,6 +7,7 @@ + diff --git a/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml index 0ba6d536..181e1b25 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml @@ -13,6 +13,9 @@ + + + diff --git a/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml index 93df91e7..efed952b 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml @@ -7,6 +7,7 @@ + diff --git a/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml index e43e4646..5f6b932e 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml @@ -7,6 +7,7 @@ +