From f18d8e0b48499410f2fb57ec853e8f8874e6f40e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= <dhji@palnet.co.kr>
Date: Thu, 22 Aug 2024 11:50:16 +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=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?=
 =?UTF-8?q?=EA=B4=80=EC=A0=9C=EA=B3=BC=20=EA=B2=80=ED=86=A0=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=EC=9C=A0=ED=98=95=20=EA=B2=80=EC=83=89=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EC=95=88=EB=90=98=EB=8A=94=20=ED=98=84=EC=83=81=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/server/server.http                                      | 5 +++--
 .../com/palnet/biz/api/comn/file/model/ValidPdfModel.java    | 2 ++
 .../biz/jpa/repository/dos/DosFltPlanQueryRepository.java    | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/http/server/server.http b/http/server/server.http
index 9f34b7a9..f4635318 100644
--- a/http/server/server.http
+++ b/http/server/server.http
@@ -66,6 +66,7 @@ Authorization: {{accessToken}}
 GET {{appHost}}/api/bas/dos/plan
     ?searchStDt=2023-06-29
     &searchEndDt=2024-06-29
+#    &reviewedProcType=W
 #    &applyNo=T201118-3010
 #    &reviewedType=W
 Authorization: {{accessToken}}
@@ -77,8 +78,8 @@ Authorization: {{accessToken}}
         const {planSno, applyNo, areaList} = d;
         console.log(`planSno: ${planSno}, applyNo: ${applyNo}`);
         areaList.forEach(a => {
-            const {planAreaSno, zoneNo, reviewedType, approvalCd} = a;
-            console.log(`planAreaSno: ${planAreaSno}, zoneNo: ${zoneNo}, reviewedType: ${reviewedType}, approvalCd: ${approvalCd}`);
+            const {planAreaSno, zoneNo, reviewedType, reviewedProcType, approvalCd} = a;
+            console.log(`planAreaSno: ${planAreaSno}, zoneNo: ${zoneNo}, reviewedType: ${reviewedType}, reviewedProcType: ${reviewedProcType}, approvalCd: ${approvalCd}`);
         })
     });
 
diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/file/model/ValidPdfModel.java b/pav-server/src/main/java/com/palnet/biz/api/comn/file/model/ValidPdfModel.java
index 69c5559a..ab58e1f0 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/comn/file/model/ValidPdfModel.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/comn/file/model/ValidPdfModel.java
@@ -1,6 +1,7 @@
 package com.palnet.biz.api.comn.file.model;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;
@@ -8,6 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Slf4j
 public class ValidPdfModel extends PdfBaseModel{
diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java
index 919675d5..73c9b689 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java
@@ -92,6 +92,10 @@ public class DosFltPlanQueryRepository {
         if (rq.getReviewedType() != null) {
             builder.and(qDosFltPlanArea.reviewedType.eq(rq.getReviewedType()).or(qDosFltPlanArea.reviewedType.isNull()));
         }
+        // 검토 처리 유형
+        if (rq.getReviewedProcType() != null) {
+            builder.and(qDosFltPlanArea.reviewedProcType.eq(rq.getReviewedProcType()));
+        }
 
         return query
                 .select(qDosFltPlanArea)