From 8b0e155cb732ff0a102f8d526e2398657cf06da2 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 16:25:13 +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 --- .../contraller/MaintenanceController.java | 2 ++ .../pojo/entity/MaintenanceTaskDetailGoods.java | 6 ++++-- .../impl/MaintenanceTaskServiceImpl.java | 17 ++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java index 079b594..50727fe 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java +++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java @@ -255,10 +255,12 @@ public class MaintenanceController extends BladeController { taskService.updateById(taskOld); List detailList = taskDto.getDetailList(); for (MaintenanceTaskDetail maintenanceTaskDetail : detailList) { + Long deptId = maintenanceTaskDetail.getDeptId(); Optional> detailGoods = Optional.ofNullable(maintenanceTaskDetail.getDetailGoodsList()); if (detailGoods.isPresent()) { List detailGoodsList = detailGoods.get(); for (MaintenanceTaskDetailGoods maintenanceTaskDetailGoods : detailGoodsList) { + maintenanceTaskDetailGoods.setDeptId(deptId); maintenanceApplyGoodsService.save(maintenanceTaskDetailGoods); } } else { diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java b/src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java index 9b2b57a..3b237b3 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java +++ b/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; } 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 a8204ec..02b457d 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 @@ -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> 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); + List maintenanceTaskDetailList = listEntry.getValue(); + for (MaintenanceTaskDetail maintenanceTaskDetail : maintenanceTaskDetailList) { + List 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());