巡检报修中添加申领物料

master
薛宏祥 1 year ago
parent 8b0e155cb7
commit 3c9b701f76
  1. 4
      src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
  2. 2
      src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java
  3. 2
      src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskServiceImpl.java

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

@ -35,7 +35,7 @@ public class MaintenanceTaskDetailGoods extends BaseEntity {
//价格
private Double price;
private Long deptId;
private Long parentId;
}

@ -82,7 +82,7 @@ public class MaintenanceTaskServiceImpl extends BaseServiceImpl<MaintenanceTaskM
MaintenanceTaskDetail dept = new MaintenanceTaskDetail();
List<MaintenanceTaskDetail> maintenanceTaskDetailList = listEntry.getValue();
for (MaintenanceTaskDetail maintenanceTaskDetail : maintenanceTaskDetailList) {
List<MaintenanceTaskDetailGoods> applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getDeptId, maintenanceTaskDetail.getDeptId()));
List<MaintenanceTaskDetailGoods> applyGoodsList = applyGoodsService.list(Wrappers.lambdaQuery(MaintenanceTaskDetailGoods.class).eq(MaintenanceTaskDetailGoods::getParentId, maintenanceTaskDetail.getId()));
maintenanceTaskDetail.setDetailGoodsList(applyGoodsList);
}
dept.setDeptName(listEntry.getKey());

Loading…
Cancel
Save