From c02496f438c1ba966070d6c64db1b79b5aa67e54 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 9 Sep 2022 02:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20=E4=BA=A4=E6=8E=A5=E7=82=B9?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE=E4=B9=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B1=95=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MapLogisticServiceImpl.java  | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 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 4936d277..c7e48462 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
@@ -1,21 +1,23 @@
 package com.cloud.kicc.commonbiz.service.impl;
 
 import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cloud.kicc.commonbiz.api.entity.*;
+import com.cloud.kicc.commonbiz.api.entity.MapLogistic;
+import com.cloud.kicc.commonbiz.api.entity.MapLogisticPoint;
+import com.cloud.kicc.commonbiz.api.entity.MapTask;
+import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset;
 import com.cloud.kicc.commonbiz.mapper.MapLogisticMapper;
-import com.cloud.kicc.commonbiz.service.*;
+import com.cloud.kicc.commonbiz.service.IMapLogisticPointService;
+import com.cloud.kicc.commonbiz.service.IMapLogisticService;
+import com.cloud.kicc.commonbiz.service.IMapTaskPresetService;
+import com.cloud.kicc.commonbiz.service.IMapTaskService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 /**
  * <p>
  * 地图核心主任务表 服务实现类
@@ -33,15 +35,9 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
     private final IMapTaskPresetService iMapTaskPresetService;
     private final IMapLogisticPointService iMapLogisticPointService;
 
-    private final HospitalService hospitalService;
-
-    private final OrgService orgService;
-
     @Override
     public void mapSaveOrUpdate(MapLogistic mapLogistic) {
         // 保存不做过多的处理,直接先删后加,由于前端未做操作记录池功能,不能实现表格数据的增删改
-        List<Org> orgList = orgService.list();
-        List<Hospital> hospitalList = hospitalService.list(Wrappers.<Hospital>lambdaQuery().eq(Hospital::getMapNotify, "1"));
         super.removeById(mapLogistic);
         iMapTaskService.remove(Wrappers.<MapTask>lambdaUpdate().eq(MapTask::getMapLogisticId, mapLogistic.getId()));
         iMapTaskPresetService.remove(Wrappers.<MapTaskPreset>lambdaUpdate().eq(MapTaskPreset::getMapLogisticId, mapLogistic.getId()));
@@ -58,12 +54,6 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo
                     mapTaskPreset.setMapLogisticId(mapLogistic.getId());
                     mapTaskPreset.setMapTaskId(mapTask.getId());
                     iMapTaskPresetService.save(mapTaskPreset);
-
-                    /*orgList.stream().filter(ietm -> StrUtil.equals(ietm.getId(), ) )*/
-
-                    /*const hospital = mapState.hospitalList.find(e => e.value == item.hospitalId),
-                    org = item.orgId ? mapState.orgList.find(e => e.value == item.orgId) : {} as MapPointType;*/
-
                     // 追加交接转办任务标记点,首次新增没有任何数据,后面会有收样员设置的位置数据覆盖
                     mapLogistic.getMapLogisticPoint().addAll(ListUtil.of(
                             new MapLogisticPoint()