From 110f862f157e734e5d5313ad4d361d5c2224e12c Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 21 May 2026 16:49:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(eqp):=20=E6=B7=BB=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E9=83=A8=E4=BD=8D=E5=85=B3=E8=81=94=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 引入 EqpEquipmentChecklistVo 和 EqpEquipmentChecklist 实体类 - 添加 EqpEquipmentChecklistMapper 数据访问层依赖 - 在查询检验部位分页列表时关联查询检验清单数据 - 将检验清单列表映射到检验部位视图对象中 - 优化导入包使用通配符简化代码 - 在 EqpEquipmentPartVo 中添加 checklistList 字段存储关联清单数据 --- .../mes/eqp/domain/vo/EqpEquipmentPartVo.java | 6 ++++++ .../impl/EqpEquipmentPartServiceImpl.java | 21 +++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java index 298f91a4..88bb69ca 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentPartVo.java @@ -6,6 +6,8 @@ import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import lombok.Data; +import java.util.List; + /** * 检验部位视图对象 eqp_equipment_part @@ -37,5 +39,9 @@ public class EqpEquipmentPartVo { @ExcelProperty(value = "备注") private String remark; + /** + * 检验清单列表 + */ + private List checklistList; } diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java index 52d5a985..5c945621 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentPartServiceImpl.java @@ -11,13 +11,14 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.mes.eqp.domain.bo.EqpEquipmentPartBo; import com.klp.mes.eqp.domain.vo.EqpEquipmentPartVo; +import com.klp.mes.eqp.domain.vo.EqpEquipmentChecklistVo; import com.klp.mes.eqp.domain.EqpEquipmentPart; +import com.klp.mes.eqp.domain.EqpEquipmentChecklist; import com.klp.mes.eqp.mapper.EqpEquipmentPartMapper; +import com.klp.mes.eqp.mapper.EqpEquipmentChecklistMapper; import com.klp.mes.eqp.service.IEqpEquipmentPartService; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; import java.util.stream.Collectors; /** @@ -31,6 +32,7 @@ import java.util.stream.Collectors; public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService { private final EqpEquipmentPartMapper baseMapper; + private final EqpEquipmentChecklistMapper checklistMapper; /** * 查询检验部位 @@ -47,7 +49,18 @@ public class EqpEquipmentPartServiceImpl implements IEqpEquipmentPartService { public TableDataInfo queryPageList(EqpEquipmentPartBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - result.getRecords().stream().map(EqpEquipmentPartVo::getPartId).collect(Collectors.toList()); + List partIds = result.getRecords().stream() + .map(EqpEquipmentPartVo::getPartId).collect(Collectors.toList()); + if (!partIds.isEmpty()) { + LambdaQueryWrapper checklistLqw = Wrappers.lambdaQuery(); + checklistLqw.in(EqpEquipmentChecklist::getPartId, partIds); + List checklistList = checklistMapper.selectVoList(checklistLqw); + Map> checklistMap = checklistList.stream() + .collect(Collectors.groupingBy(EqpEquipmentChecklistVo::getPartId)); + result.getRecords().forEach(vo -> + vo.setChecklistList(checklistMap.getOrDefault(vo.getPartId(), Collections.emptyList())) + ); + } return TableDataInfo.build(result); }