diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java index dd496b14..09b376a1 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java @@ -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 getDosPlan(BasDosPlanRq rq) { - List planBasList = dosFltPlanBasRepository.findBySchFltStDtLessThanEqualAndSchFltEndDtGreaterThanEqualOrderByApplyDtAscCreateDtAsc(rq.getSearchEndDt(), rq.getSearchEndDt()); + List planBasList = dosFltPlanBasRepository.findBySchFltStDtLessThanEqualAndSchFltEndDtGreaterThanEqualOrderByApplyDtAscCreateDtAsc(rq.getSearchEndDt(), rq.getSearchStDt()); + + if(planBasList.isEmpty()) { + return new ArrayList<>(); + } List planSnoList = planBasList.stream().map(DosFltPlanBas::getPlanSno).collect(Collectors.toList()); + + List areaList = dosFltPlanAreaRepository.findByPlanSnoInOrderByZoneNoAsc(planSnoList); List resultList = dosFltPlanResultRepository.findByPlanSnoIn(planSnoList); diff --git a/pav-server/src/main/resources/log4jdbc.log4j2.properties b/pav-server/src/main/resources/log4jdbc.log4j2.properties new file mode 100644 index 00000000..551c9ef4 --- /dev/null +++ b/pav-server/src/main/resources/log4jdbc.log4j2.properties @@ -0,0 +1 @@ +log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator \ No newline at end of file