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; - /** *

* 地图核心主任务表 服务实现类 @@ -33,15 +35,9 @@ public class MapLogisticServiceImpl extends ServiceImpl orgList = orgService.list(); - List hospitalList = hospitalService.list(Wrappers.lambdaQuery().eq(Hospital::getMapNotify, "1")); super.removeById(mapLogistic); iMapTaskService.remove(Wrappers.lambdaUpdate().eq(MapTask::getMapLogisticId, mapLogistic.getId())); iMapTaskPresetService.remove(Wrappers.lambdaUpdate().eq(MapTaskPreset::getMapLogisticId, mapLogistic.getId())); @@ -58,12 +54,6 @@ public class MapLogisticServiceImpl extends ServiceImpl 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()