From 6e78b1d50570fc7299a4558be666733642d1ca4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Fri, 3 May 2024 19:40:32 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=93=9C=EB=A1=A0=EC=9B=90=EC=8A=A4?= =?UTF-8?q?=ED=86=B1=20=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/bas/dos/service/BasDosService.java | 12 +++++++++++- .../src/main/resources/log4jdbc.log4j2.properties | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pav-server/src/main/resources/log4jdbc.log4j2.properties 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