巡检报修中添加申领物料

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<MaintenanceTaskMapper, MaintenanceTask> 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<MaintenanceTaskM
             Map<String, List<MaintenanceTaskDetail>> deptMap = floors.stream().collect(Collectors.groupingBy(MaintenanceTaskDetail::getDeptName));
             for (Map.Entry<String, List<MaintenanceTaskDetail>> listEntry : deptMap.entrySet()) {
                 MaintenanceTaskDetail dept = new MaintenanceTaskDetail();
+                List<MaintenanceTaskDetailGoods> 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);