|
|
|
@ -14,13 +14,16 @@ import lombok.RequiredArgsConstructor;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.locationtech.jts.geom.Coordinate; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
@Slf4j |
|
|
|
|
@RequiredArgsConstructor |
|
|
|
|
@Transactional |
|
|
|
|
@Service |
|
|
|
|
public class BasDosService { |
|
|
|
|
|
|
|
|
@ -36,11 +39,18 @@ public class BasDosService {
|
|
|
|
|
* @param rq |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
@Transactional(readOnly = true) |
|
|
|
|
public List<BasDosPlanRs> getDosPlan(BasDosPlanRq rq) { |
|
|
|
|
|
|
|
|
|
List<DosFltPlanBas> planBasList = dosFltPlanBasRepository.findBySchFltStDtLessThanEqualAndSchFltEndDtGreaterThanEqualOrderByApplyDtAscCreateDtAsc(rq.getSearchEndDt(), rq.getSearchEndDt()); |
|
|
|
|
List<DosFltPlanBas> planBasList = dosFltPlanBasRepository.findBySchFltStDtLessThanEqualAndSchFltEndDtGreaterThanEqualOrderByApplyDtAscCreateDtAsc(rq.getSearchEndDt(), rq.getSearchStDt()); |
|
|
|
|
|
|
|
|
|
if(planBasList.isEmpty()) { |
|
|
|
|
return new ArrayList<>(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<Long> planSnoList = planBasList.stream().map(DosFltPlanBas::getPlanSno).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<DosFltPlanArea> areaList = dosFltPlanAreaRepository.findByPlanSnoInOrderByZoneNoAsc(planSnoList); |
|
|
|
|
List<DosFltPlanResult> resultList = dosFltPlanResultRepository.findByPlanSnoIn(planSnoList); |
|
|
|
|
|
|
|
|
|