From 4f9abc2ce6d698da961e6ffc239d42089bbfaa5e Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Sat, 3 Sep 2022 01:08:59 +0800 Subject: [PATCH] =?UTF-8?q?:rocket:=20=E4=BC=98=E5=8C=96=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MapLogisticServiceImpl.java | 14 ++++++-------- kicc-ui | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java index 7f3635fe..0f168a65 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/MapLogisticServiceImpl.java @@ -43,22 +43,20 @@ public class MapLogisticServiceImpl extends ServiceImpl { mapTask.setMapLogisticId(mapLogistic.getId()); - iMapTaskService.save(mapTask); - // 匹配查找跟地图任务关联的地图标记点数据 + // 匹配查找跟地图任务关联的地图标记点数据,不需要包含其他收养样员的交接任务标记点,他们已经与自己的任务进行了id绑定 mapLogistic.getMapLogisticPoint().stream() - .filter(item -> item.getKey().equals(mapTask.getKey())).forEach(item -> { - item.setMapLogisticId(mapLogistic.getId()); - item.setMapTaskId(mapTask.getId()); - iMapLogisticPointService.save(item); - }); + .filter(item -> item.getKey().equals(mapTask.getKey())).forEach(item -> item.setMapTaskId(mapTask.getId())); if (ObjectUtil.isNotEmpty(mapTask.getMapTaskPreset())) { mapTask.getMapTaskPreset().forEach(mapTaskPreset -> { mapTaskPreset.setMapLogisticId(mapLogistic.getId()); mapTaskPreset.setMapTaskId(mapTask.getId()); - iMapTaskPresetService.save(mapTaskPreset); }); + iMapTaskPresetService.saveBatch(mapTask.getMapTaskPreset()); } }); + mapLogistic.getMapLogisticPoint().forEach(item -> item.setMapLogisticId(mapLogistic.getId())); + iMapTaskService.saveBatch(mapLogistic.getMapTask()); + iMapLogisticPointService.saveBatch(mapLogistic.getMapLogisticPoint()); return false; } diff --git a/kicc-ui b/kicc-ui index 17600d7e..067ded64 160000 --- a/kicc-ui +++ b/kicc-ui @@ -1 +1 @@ -Subproject commit 17600d7e2220eb0bbbc3080fb8e544d52f756252 +Subproject commit 067ded646d544e739ad36858af466995eba569e7