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 ef1c538c..cc8c5dfe 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 @@ -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)