From 0179cf986b44f6c6a0e538b251586bb2aa306cfc Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 25 May 2026 11:46:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(mes/eqp):=20=E4=B8=BA=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E7=85=A7=E7=89=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在EqpEquipmentInspectionRecord实体类、Bo和Vo中新增photo字段,用于存储以英文逗号分隔的巡检照片URL - 在EqpEquipmentInspectionRecordMapper.xml中映射photo字段到数据库查询结果 - 在EqpEquipmentInspectionRecordServiceImpl的查询条件中增加对photo字段的过滤支持 --- .../com/klp/mes/eqp/domain/EqpEquipmentInspectionRecord.java | 4 ++++ .../mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java | 5 +++++ .../mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java | 5 +++++ .../impl/EqpEquipmentInspectionRecordServiceImpl.java | 1 + .../mapper/eqp/EqpEquipmentInspectionRecordMapper.xml | 1 + 5 files changed, 16 insertions(+) diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentInspectionRecord.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentInspectionRecord.java index 6ee806d3..55a3aaff 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentInspectionRecord.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/EqpEquipmentInspectionRecord.java @@ -54,6 +54,10 @@ public class EqpEquipmentInspectionRecord extends BaseEntity { * 备注 */ private String remark; + /** + * 巡检照片URL,多个用英文逗号分隔 + */ + private String photo; /** * 删除标识 0正常 2删除 */ diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java index 7b447f2a..d7ca53a3 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpEquipmentInspectionRecordBo.java @@ -59,5 +59,10 @@ public class EqpEquipmentInspectionRecordBo extends BaseEntity { */ private String remark; + /** + * 巡检照片URL,多个用英文逗号分隔 + */ + private String photo; + } diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java index ef7b09de..07cf066d 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentInspectionRecordVo.java @@ -69,5 +69,10 @@ public class EqpEquipmentInspectionRecordVo { @ExcelProperty(value = "备注") private String remark; + /** + * 巡检照片URL,多个用英文逗号分隔 + */ + private String photo; + } diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java index 00ad8094..4fd4bd25 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionRecordServiceImpl.java @@ -62,6 +62,7 @@ public class EqpEquipmentInspectionRecordServiceImpl implements IEqpEquipmentIns Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCheckId() != null, EqpEquipmentInspectionRecord::getCheckId, bo.getCheckId()); + lqw.eq(StringUtils.isNotBlank(bo.getPhoto()), EqpEquipmentInspectionRecord::getPhoto, bo.getPhoto()); lqw.eq(bo.getShift() != null, EqpEquipmentInspectionRecord::getShift, bo.getShift()); lqw.eq(bo.getInspectTime() != null, EqpEquipmentInspectionRecord::getInspectTime, bo.getInspectTime()); lqw.eq(bo.getRunStatus() != null, EqpEquipmentInspectionRecord::getRunStatus, bo.getRunStatus()); diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml index a7714b48..1f5c97ad 100644 --- a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml +++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentInspectionRecordMapper.xml @@ -13,6 +13,7 @@ +