|
|
|
@ -15,6 +15,7 @@ import com.palnet.biz.api.external.model.DosApprovalResult;
|
|
|
|
|
import com.palnet.biz.api.external.service.DronOneStopService; |
|
|
|
|
import com.palnet.biz.jpa.entity.DosFltPlanArea; |
|
|
|
|
import com.palnet.biz.jpa.entity.DosFltPlanBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.DosFltPlanDrone; |
|
|
|
|
import com.palnet.biz.jpa.entity.DosFltPlanResult; |
|
|
|
|
import com.palnet.biz.jpa.entity.type.ReviewedProcType; |
|
|
|
|
import com.palnet.biz.jpa.entity.type.ReviewedType; |
|
|
|
@ -1005,6 +1006,33 @@ public class BasDosService {
|
|
|
|
|
pagination.setIsLast(isLast); |
|
|
|
|
|
|
|
|
|
Map<Long , DosFltPlanBas> fltPlanBasMap = this.getConvertMap(planBasList, "planSno", Long.class); |
|
|
|
|
Map<Long , List<BasDosPlanDroneRs>> fltDroneBasMap = dosFltPlanDroneRepository.findByPlanSnoIn(planSnoList).stream() |
|
|
|
|
.map(drone -> { |
|
|
|
|
String weightCd = drone.getWeightCd(); |
|
|
|
|
WeightCdType weightCdType = WeightCdType.fromCode(weightCd); |
|
|
|
|
return BasDosPlanDroneRs.builder() |
|
|
|
|
.planDroneSno(drone.getPlanDroneSno()) |
|
|
|
|
.fbctnNo(drone.getFbctnNo()) |
|
|
|
|
.benefit(drone.getBenefit()) |
|
|
|
|
.weightCd(drone.getWeightCd()) |
|
|
|
|
.weightNm(weightCdType != null ? weightCdType.getMessage() : null) |
|
|
|
|
.insrncJoinYn(drone.getInsrncJoinYn()) |
|
|
|
|
.planSno(drone.getPlanSno()) |
|
|
|
|
.build(); |
|
|
|
|
}) |
|
|
|
|
.collect(Collectors.groupingBy(BasDosPlanDroneRs::getPlanSno));; |
|
|
|
|
|
|
|
|
|
Map<Long , List<BasDosPlanPilotRs>> fltPliotBasMap = dosFltPlanPilotRepository.findByPlanSnoIn(planSnoList).stream() |
|
|
|
|
.map(pilot -> { |
|
|
|
|
return BasDosPlanPilotRs.builder() |
|
|
|
|
.planPilotSno(pilot.getPlanPilotSno()) |
|
|
|
|
.pilotNm(pilot.getPilotNm()) |
|
|
|
|
.birthDate(pilot.getBirthDate()) |
|
|
|
|
.crtfctNo(pilot.getCrtfctNo()) |
|
|
|
|
.planSno(pilot.getPlanPilotSno()) |
|
|
|
|
.build(); |
|
|
|
|
}) |
|
|
|
|
.collect(Collectors.groupingBy(BasDosPlanPilotRs::getPlanSno)); |
|
|
|
|
|
|
|
|
|
List<DosFltPlanArea> areaList = dosFltPlanQueryRepository.findByPlanSnoInAndSearchOrderByZoneNoAsc(planSnoList, rq); |
|
|
|
|
List<DosFltPlanResult> resultList = dosFltPlanResultRepository.findByPlanSnoIn(planSnoList); |
|
|
|
@ -1207,35 +1235,13 @@ public class BasDosService {
|
|
|
|
|
.build(); |
|
|
|
|
areaRsList.add(areaRs); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
areaList.remove(area); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// TODO :: 속도이슈 걸리는 곳.. [paging 하면 완화됨]
|
|
|
|
|
List<BasDosPlanDroneRs> droneList = null; |
|
|
|
|
List<BasDosPlanPilotRs> pilotList = null; |
|
|
|
|
if (type == PlanSelectType.LIST) { |
|
|
|
|
droneList = dosFltPlanDroneRepository.findByPlanSno(planSno).stream().map(drone -> { |
|
|
|
|
String weightCd = drone.getWeightCd(); |
|
|
|
|
WeightCdType weightCdType = WeightCdType.fromCode(weightCd); |
|
|
|
|
return BasDosPlanDroneRs.builder() |
|
|
|
|
.planDroneSno(drone.getPlanDroneSno()) |
|
|
|
|
.fbctnNo(drone.getFbctnNo()) |
|
|
|
|
.benefit(drone.getBenefit()) |
|
|
|
|
.weightCd(drone.getWeightCd()) |
|
|
|
|
.weightNm(weightCdType != null ? weightCdType.getMessage() : null) |
|
|
|
|
.insrncJoinYn(drone.getInsrncJoinYn()) |
|
|
|
|
.build(); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
pilotList = dosFltPlanPilotRepository.findByPlanSno(planSno).stream().map(pilot -> { |
|
|
|
|
return BasDosPlanPilotRs.builder() |
|
|
|
|
.planPilotSno(pilot.getPlanPilotSno()) |
|
|
|
|
.pilotNm(pilot.getPilotNm()) |
|
|
|
|
.birthDate(pilot.getBirthDate()) |
|
|
|
|
.crtfctNo(pilot.getCrtfctNo()) |
|
|
|
|
.build(); |
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
droneList = fltDroneBasMap.get(planSno); |
|
|
|
|
pilotList = fltPliotBasMap.get(planSno); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|