巡检报修中添加申领物料

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -255,10 +255,12 @@ public class MaintenanceController extends BladeController {
         taskService.updateById(taskOld);
         List<MaintenanceTaskDetail> detailList = taskDto.getDetailList();
         for (MaintenanceTaskDetail maintenanceTaskDetail : detailList) {
+            Long deptId = maintenanceTaskDetail.getDeptId();
             Optional<List<MaintenanceTaskDetailGoods>> detailGoods = Optional.ofNullable(maintenanceTaskDetail.getDetailGoodsList());
             if (detailGoods.isPresent()) {
                 List<MaintenanceTaskDetailGoods> detailGoodsList = detailGoods.get();
                 for (MaintenanceTaskDetailGoods maintenanceTaskDetailGoods : detailGoodsList) {
+                    maintenanceTaskDetailGoods.setDeptId(deptId);
                     maintenanceApplyGoodsService.save(maintenanceTaskDetailGoods);
                 }
             } else {

src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java

@@ -1,5 +1,7 @@
 package org.springblade.modules.business.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,7 +18,7 @@ public class MaintenanceTaskDetailGoods extends BaseEntity {
     private String goodsName;
 
     //库存id
-    private Long warehouseId;
+    private String warehouseId;
 
     //规格
     private String rule;
@@ -33,7 +35,7 @@ public class MaintenanceTaskDetailGoods extends BaseEntity {
     //价格
     private Double price;
 
-    private Long parentId;
+    private Long deptId;
 
 
 }

src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java

@@ -1,7 +1,6 @@
 
 package org.springblade.modules.business.service.impl;
 
-import cn.hutool.core.io.resource.InputStreamResource;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -10,29 +9,22 @@ import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 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;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
 import org.springblade.modules.business.service.IMaintenanceTaskDetailService;
-import org.springblade.modules.business.service.IMaintenanceTaskService;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
 import java.util.List;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -88,10 +80,13 @@ 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()));
+                List<MaintenanceTaskDetail> maintenanceTaskDetailList = listEntry.getValue();
-                dept.setDetailGoodsList(applyGoodsList);
+                for (MaintenanceTaskDetail maintenanceTaskDetail : maintenanceTaskDetailList) {
+                    List<MaintenanceTaskDetailGoods> applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getDeptId, maintenanceTaskDetail.getDeptId()));
+                    maintenanceTaskDetail.setDetailGoodsList(applyGoodsList);
+                }
                 dept.setDeptName(listEntry.getKey());
-                dept.setDetails(listEntry.getValue());
+                dept.setDetails(maintenanceTaskDetailList);
                 deptList.add(dept);
             }
             floor.setFloorName(stringListEntry.getKey());