Merge commit 'f18d8e0b48499410f2fb57ec853e8f8874e6f40e' into feature/dos/paging

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;
+            const {planAreaSno, zoneNo, reviewedType, reviewedProcType, approvalCd} = a;
-            console.log(`planAreaSno: ${planAreaSno}, zoneNo: ${zoneNo}, reviewedType: ${reviewedType}, approvalCd: ${approvalCd}`);
+            console.log(`planAreaSno: ${planAreaSno}, zoneNo: ${zoneNo}, reviewedType: ${reviewedType}, reviewedProcType: ${reviewedProcType}, approvalCd: ${approvalCd}`);
         })
     });
 

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{

pav-server/src/main/java/com/palnet/biz/jpa/repository/dos/DosFltPlanQueryRepository.java

@@ -94,6 +94,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)