From d3e79914a4657bf39bb4e59cc7bf35cf6492da58 Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期四, 02 十一月 2023 18:05:41 +0800 Subject: [PATCH] 操作证管理、设备点检工单自动生成 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyDetailServiceImpl.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyDetailServiceImpl.java index 71ca6e7..41916c0 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyDetailServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/OperationCertificateApplyDetailServiceImpl.java @@ -1,10 +1,18 @@ package org.jeecg.modules.eam.service.impl; +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.modules.eam.entity.Equipment; import org.jeecg.modules.eam.entity.OperationCertificateApplyDetail; import org.jeecg.modules.eam.mapper.OperationCertificateApplyDetailMapper; +import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.service.IOperationCertificateApplyDetailService; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -19,9 +27,24 @@ @Autowired private OperationCertificateApplyDetailMapper operationCertificateApplyDetailMapper; + @Autowired + private IEamEquipmentService equipmentService; @Override public List<OperationCertificateApplyDetail> selectByMainId(String mainId) { - return operationCertificateApplyDetailMapper.selectByMainId(mainId); + List<OperationCertificateApplyDetail> operationCertificateApplyDetailList = operationCertificateApplyDetailMapper.selectByMainId(mainId); + for(OperationCertificateApplyDetail operationCertificateApplyDetail : operationCertificateApplyDetailList){ + List<String> equipmentIdLsit = Arrays.asList(operationCertificateApplyDetail.getEquipmentIds().split(",")); + List<String> equipmentNameLsit = new ArrayList<>(); + for(String equipmentId : equipmentIdLsit){ + Equipment equipment = equipmentService.lambdaQuery().eq(Equipment::getId,equipmentId).eq(Equipment::getDelFlag, CommonConstant.DEL_FLAG_0).one(); + if(equipment != null){ + equipmentNameLsit.add(equipment.getNum()); + } + } + String equipmentNames = equipmentNameLsit.stream().map(String::toString).collect(Collectors.joining(",")); + operationCertificateApplyDetail.setEquipmentNames(equipmentNames); + } + return operationCertificateApplyDetailList; } } -- Gitblit v1.9.3