From b7d6eb1559526295470a47ac7824d518d16b8e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?= <14281818+xue-hongxiang@user.noreply.gitee.com> Date: Thu, 19 Dec 2024 14:12:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=8A=A5=E4=BF=AE=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B3=E9=A2=86=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/MaintenanceTaskServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java index 8755b7c..a8204ec 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java @@ -12,9 +12,11 @@ import org.springblade.common.constant.CommonConstant; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.modules.business.excel.MaintenanceTaskDetailExcel; +import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods; import org.springblade.modules.business.pojo.vo.MaintenanceTaskDetailVO; import org.springblade.modules.business.pojo.vo.MaintenanceTaskVO; import org.springblade.modules.business.pojo.vo.SearchMaintenancePersonnelVO; +import org.springblade.modules.business.service.IMaintenanceApplyGoodsService; import org.springblade.modules.business.service.IMaintenanceTaskService; import org.springblade.modules.business.mapper.MaintenanceTaskMapper; import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask; @@ -45,6 +47,7 @@ import java.util.stream.Collectors; public class MaintenanceTaskServiceImpl extends BaseServiceImpl implements IMaintenanceTaskService { private final IMaintenanceTaskDetailService taskDetailService; + private final IMaintenanceApplyGoodsService applyGoodsService; @Override public MaintenanceTask taskDetail(Long taskId) { @@ -85,6 +88,8 @@ public class MaintenanceTaskServiceImpl extends BaseServiceImpl> deptMap = floors.stream().collect(Collectors.groupingBy(MaintenanceTaskDetail::getDeptName)); for (Map.Entry> listEntry : deptMap.entrySet()) { MaintenanceTaskDetail dept = new MaintenanceTaskDetail(); + List applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getParentId, dept.getId())); + dept.setDetailGoodsList(applyGoodsList); dept.setDeptName(listEntry.getKey()); dept.setDetails(listEntry.getValue()); deptList.add(dept);