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 50727fe..94e15e5 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java +++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java @@ -255,12 +255,12 @@ public class MaintenanceController extends BladeController { taskService.updateById(taskOld); List detailList = taskDto.getDetailList(); for (MaintenanceTaskDetail maintenanceTaskDetail : detailList) { - Long deptId = maintenanceTaskDetail.getDeptId(); + Long id = maintenanceTaskDetail.getId(); Optional> detailGoods = Optional.ofNullable(maintenanceTaskDetail.getDetailGoodsList()); if (detailGoods.isPresent()) { List detailGoodsList = detailGoods.get(); for (MaintenanceTaskDetailGoods maintenanceTaskDetailGoods : detailGoodsList) { - maintenanceTaskDetailGoods.setDeptId(deptId); + maintenanceTaskDetailGoods.setParentId(id); 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 3b237b3..a0e00f7 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 @@ -35,7 +35,7 @@ public class MaintenanceTaskDetailGoods extends BaseEntity { //价格 private Double price; - private Long deptId; + private Long parentId; } 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 02b457d..a6a5214 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 @@ -82,7 +82,7 @@ public class MaintenanceTaskServiceImpl extends BaseServiceImpl maintenanceTaskDetailList = listEntry.getValue(); for (MaintenanceTaskDetail maintenanceTaskDetail : maintenanceTaskDetailList) { - List applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getDeptId, maintenanceTaskDetail.getDeptId())); + List applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getParentId, maintenanceTaskDetail.getId())); maintenanceTaskDetail.setDetailGoodsList(applyGoodsList); } dept.setDeptName(listEntry.getKey());