From 497cee32c9979c06247b1145a5408281e6eece05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Tue, 9 Jul 2024 15:35:46 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=93=9C=EB=A1=A0=EC=9B=90=EC=8A=A4?= =?UTF-8?q?=ED=86=B1=20=ED=95=9C=EA=B8=80=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?UTF-8?q?=EB=93=9C(=EC=83=89=EC=83=81=EC=A0=81=EC=9A=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http/server/server.http | 2 +- .../com/palnet/biz/api/bas/dos/service/BasDosService.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/http/server/server.http b/http/server/server.http index 03d47de3..a19a7e24 100644 --- a/http/server/server.http +++ b/http/server/server.http @@ -117,7 +117,7 @@ GET {{appHost}}/api/bas/dos/plan/download/pdf?searchStDt=2024-06-14&searchEndDt= Authorization: {{accessToken}} ### dos(드론원스톱) hwpx download -GET {{appHost}}/api/bas/dos/plan/download/han-com?searchStDt=2024-06-14&searchEndDt=2024-06-14 +GET {{appHost}}/api/bas/dos/plan/download/han-com?searchStDt=2023-06-14&searchEndDt=2025-06-14 Authorization: {{accessToken}} ### dos(드론원스톱) 검토 수정 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 68023a81..b1ba0694 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 @@ -659,6 +659,7 @@ public class BasDosService { int count = 0; for (BasDosPlanRs planRs : rs) { for (BasDosPlanAreaRs areaRs : planRs.getAreaList()) { + ApprovalCd approvalCd = ApprovalCd.fromCode(areaRs.getApprovalCd()); count++; Tr tr = trByClone.clone(); @@ -710,6 +711,9 @@ public class BasDosService { : "불가" : "비대상"); + if (approvalCd == ApprovalCd.UNAPPROVED) { + run.charPrIDRef("17"); + } run.addRunItem(t); break; case 7: @@ -725,7 +729,7 @@ public class BasDosService { } } - table.rowCnt((short) ++count); + table.rowCnt((short) (count + 1)); String applyDtStr = ""; if (applyDtMin != null && applyDtMax != null) { if (applyDtMin.equals(applyDtMax)) {