|
|
@ -1,21 +1,23 @@ |
|
|
|
package com.cloud.kicc.commonbiz.service.impl; |
|
|
|
package com.cloud.kicc.commonbiz.service.impl; |
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.ListUtil; |
|
|
|
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.ObjectUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
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.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 lombok.RequiredArgsConstructor; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* <p> |
|
|
|
* <p> |
|
|
|
* 地图核心主任务表 服务实现类 |
|
|
|
* 地图核心主任务表 服务实现类 |
|
|
@ -33,15 +35,9 @@ public class MapLogisticServiceImpl extends ServiceImpl<MapLogisticMapper, MapLo |
|
|
|
private final IMapTaskPresetService iMapTaskPresetService; |
|
|
|
private final IMapTaskPresetService iMapTaskPresetService; |
|
|
|
private final IMapLogisticPointService iMapLogisticPointService; |
|
|
|
private final IMapLogisticPointService iMapLogisticPointService; |
|
|
|
|
|
|
|
|
|
|
|
private final HospitalService hospitalService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final OrgService orgService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void mapSaveOrUpdate(MapLogistic mapLogistic) { |
|
|
|
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); |
|
|
|
super.removeById(mapLogistic); |
|
|
|
iMapTaskService.remove(Wrappers.<MapTask>lambdaUpdate().eq(MapTask::getMapLogisticId, mapLogistic.getId())); |
|
|
|
iMapTaskService.remove(Wrappers.<MapTask>lambdaUpdate().eq(MapTask::getMapLogisticId, mapLogistic.getId())); |
|
|
|
iMapTaskPresetService.remove(Wrappers.<MapTaskPreset>lambdaUpdate().eq(MapTaskPreset::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.setMapLogisticId(mapLogistic.getId()); |
|
|
|
mapTaskPreset.setMapTaskId(mapTask.getId()); |
|
|
|
mapTaskPreset.setMapTaskId(mapTask.getId()); |
|
|
|
iMapTaskPresetService.save(mapTaskPreset); |
|
|
|
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( |
|
|
|
mapLogistic.getMapLogisticPoint().addAll(ListUtil.of( |
|
|
|
new MapLogisticPoint() |
|
|
|
new MapLogisticPoint() |
|
|
|