From 0fb65edc4c167de6e308c1658fc1f0722c5723d3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6ARNG1Q\\dlsgk" Date: Mon, 23 Sep 2024 17:34:08 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EC=A6=9D=EC=84=9C=20=EB=B0=9C?= =?UTF-8?q?=ED=96=89=EC=99=84=EB=A3=8C=20=EC=97=91=EC=85=80=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C=20api=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/excelDown/ExcelDownController.java | 6 ++-- .../qcast/biz/excelDown/ExcelDownMapper.java | 2 +- .../qcast/biz/excelDown/ExcelDownService.java | 4 +-- ...eRequest.java => WrntIsncCmplRequest.java} | 2 +- ...esponse.java => WrntIsncCmplResponse.java} | 4 +-- .../mappers/excelDown/excelDownMapper.xml | 36 +++++++++++-------- 6 files changed, 30 insertions(+), 24 deletions(-) rename src/main/java/com/interplug/qcast/biz/excelDown/dto/{CmplWrntIsueRequest.java => WrntIsncCmplRequest.java} (95%) rename src/main/java/com/interplug/qcast/biz/excelDown/dto/{CmplWrntIsueResponse.java => WrntIsncCmplResponse.java} (97%) diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownController.java b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownController.java index 9a9a00c3..531a83fd 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownController.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownController.java @@ -41,10 +41,10 @@ public class ExcelDownController { } @Operation(description = "과거데이터_보증서발행완료 물건 엑셀다운로드 조회") - @PostMapping("/warranty-issued-excl-down-data") + @PostMapping("/wrnt-isnc-cmpl-excl-down-data") @ResponseStatus(HttpStatus.OK) - public List warrantyIssuedDataExclDownData(@RequestBody CmplWrntIsueRequest cmplWrntIsueRequest) throws Exception { - return excelDownService.selectWarrantyIssuedDataExclDownData(cmplWrntIsueRequest); + public List warrantyIssuedCmpExclDownData(@RequestBody WrntIsncCmplRequest wrntIsncCmplRequest) throws Exception { + return excelDownService.selectWarrantyIssuedCmpExclDownData(wrntIsncCmplRequest); } diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownMapper.java b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownMapper.java index 25c7ea71..094ac172 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownMapper.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownMapper.java @@ -13,5 +13,5 @@ interface ExcelDownMapper { List selectNtrCtsCmpExclDownData(NtrCtsCmpRequest ntrCtsCmpRequest) throws Exception; - List selectWarrantyIssuedDataExclDownData(CmplWrntIsueRequest cmplWrntIsueRequest) throws Exception; + List selectWarrantyIssuedCmpExclDownData(WrntIsncCmplRequest wrntIsncCmplRequest) throws Exception; } diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownService.java b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownService.java index 72c086ea..939cd6b8 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownService.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownService.java @@ -25,7 +25,7 @@ public class ExcelDownService { return excelDownMapper.selectNtrCtsCmpExclDownData(ntrCtsCmpRequest); } - public List selectWarrantyIssuedDataExclDownData(CmplWrntIsueRequest cmplWrntIsueRequest) throws Exception { - return excelDownMapper.selectWarrantyIssuedDataExclDownData(cmplWrntIsueRequest); + public List selectWarrantyIssuedCmpExclDownData(WrntIsncCmplRequest wrntIsncCmplRequest) throws Exception { + return excelDownMapper.selectWarrantyIssuedCmpExclDownData(wrntIsncCmplRequest); } } diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/dto/CmplWrntIsueRequest.java b/src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplRequest.java similarity index 95% rename from src/main/java/com/interplug/qcast/biz/excelDown/dto/CmplWrntIsueRequest.java rename to src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplRequest.java index db20ce89..276b869e 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/dto/CmplWrntIsueRequest.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplRequest.java @@ -6,7 +6,7 @@ import lombok.Setter; @Getter @Setter -public class CmplWrntIsueRequest { +public class WrntIsncCmplRequest { @Schema(description = "과거일자 기준일") private String sch_baseDt; @Schema(description = "기간 구분 ( 보증서발급일, 보증서신청일 )") diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/dto/CmplWrntIsueResponse.java b/src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplResponse.java similarity index 97% rename from src/main/java/com/interplug/qcast/biz/excelDown/dto/CmplWrntIsueResponse.java rename to src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplResponse.java index b3c2c08a..8c39d7d6 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/dto/CmplWrntIsueResponse.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplResponse.java @@ -6,7 +6,7 @@ import lombok.Setter; @Getter @Setter -public class CmplWrntIsueResponse { +public class WrntIsncCmplResponse { @Schema(description = "부동산 관리 번호") private String objectNo; @Schema(description = "계획") @@ -71,7 +71,7 @@ public class CmplWrntIsueResponse { private String standGuaranteeNoTarget; @Schema(description = "가대 보증 세트") private String standGuaranteeSet; - @Schema(description = "자연재해보상통지일 ") + @Schema(description = "자연재해보상통지일") private String naturalDisasterCopensateNotifiedDate; @Schema(description = "연장기기 보증 통지일") private String equipGuaranteeNotifiedDate; diff --git a/src/main/resources/mappers/excelDown/excelDownMapper.xml b/src/main/resources/mappers/excelDown/excelDownMapper.xml index aaaea146..8ddc2089 100644 --- a/src/main/resources/mappers/excelDown/excelDownMapper.xml +++ b/src/main/resources/mappers/excelDown/excelDownMapper.xml @@ -156,7 +156,6 @@ LEFT JOIN M_COMM_L C3 ON C3.CODE = A.ROOF_MATERIAL_ID AND C3.HEAD_CD = '201900' - LEFT JOIN M_SUPPORT_METHOD P ON A.SUPPORT_METHOD_ID = P.SUPPORT_METHOD_ID LEFT JOIN M_COMM_L C4 @@ -178,9 +177,10 @@ ON G.FIRST_AGENT_ID = Y.SALE_STORE_ID /*1차점정보*/ WHERE A.DEL_FLG = 0 AND B.DEL_FLG = 0 - AND B.ESTIMATE_DETAIL_CREATE_DATE #{sch_baseDt} /* 과거일자 기준일 */ + AND B.ESTIMATE_DETAIL_CREATE_DATE #{sch_baseDt} + ' 23:59:59' /* 과거일자 기준일 */ - AND B.ESTIMATE_DETAIL_CREATE_DATE BETWEEN #{sch_startDt} and #{sch_endDt} + AND B.ESTIMATE_DETAIL_CREATE_DATE =]]> #{sch_startDt} + ' 00:00:00' + AND B.ESTIMATE_DETAIL_CREATE_DATE #{sch_endDt} + ' 23:59:59' AND B.SALE_STORE_ID = #{sch_saleStoreId} @@ -255,9 +255,10 @@ WHERE C.DEL_FLG = 0 AND D.DEL_FLG = 0 AND B.DEL_FLG = 0 - AND C.ESTIMATE_DETAIL_CREATE_DATE #{sch_baseDt} /* 과거일자 기준일 */ + AND C.ESTIMATE_DETAIL_CREATE_DATE #{sch_baseDt} + ' 23:59:59' /* 과거일자 기준일 */ - AND C.ESTIMATE_DETAIL_CREATE_DATE BETWEEN #{sch_startDt} and #{sch_endDt} + AND C.ESTIMATE_DETAIL_CREATE_DATE =]]> #{sch_startDt} + ' 00:00:00' + AND C.ESTIMATE_DETAIL_CREATE_DATE #{sch_endDt} + ' 23:59:59' AND C.SALE_STORE_ID = #{sch_saleStoreId} @@ -349,18 +350,21 @@ LEFT JOIN T_OBJECT D ON A.OBJECT_NO = D.OBJECT_NO WHERE D.DEL_FLG != 1 - AND D.ESTIMATE_DETAIL_CREATE_DATE #{sch_baseDt} /* 과거일자 기준일 */ + AND D.ESTIMATE_DETAIL_CREATE_DATE #{sch_baseDt} + ' 23:59:59' /* 과거일자 기준일 */ - AND A.NATURAL_DISASTER_COPENSATE_NOTIFIED_DATE BETWEEN #{sch_startDt} and #{sch_endDt} + AND A.NATURAL_DISASTER_COPENSATE_NOTIFIED_DATE =]]> #{sch_startDt} + ' 00:00:00' + AND A.NATURAL_DISASTER_COPENSATE_NOTIFIED_DATE #{sch_endDt} + ' 23:59:59' - AND A.GUARANTEE_ISSUE_DATE BETWEEN #{sch_startDt} and #{sch_endDt} + AND A.GUARANTEE_ISSUE_DATE =]]> #{sch_startDt} + ' 00:00:00' + AND A.GUARANTEE_ISSUE_DATE #{sch_endDt} + ' 23:59:59' - AND A.COOPERATION_DATE BETWEEN #{sch_startDt} and #{sch_endDt} + AND A.COOPERATION_DATE =]]> #{sch_startDt} + ' 00:00:00' + AND A.COOPERATION_DATE #{sch_endDt} + ' 23:59:59' @@ -376,10 +380,10 @@ - + /* sqlid : com.interplug.qcast.api.excelDown.selectWarrantyIssuedCmpExclDownData (보증서발행완료 물건 엑셀 다운로드 데이터 조회)*/ SELECT - A.OBJECT_NO /* 부동산 관리 번호 */ + A.OBJECT_NO /* 부동산 관리 번호 */ , A.PLAN_NO /* 계획 */ , A.GUARANTEE_APPLY_DATE /* 보증서 신청일 */ , A.GUARANTEE_APPROVAL_DATE /* 보증서 승인일 */ @@ -433,11 +437,13 @@ - - AND A.GUARANTEE_ISSUE_DATE BETWEEN #{sch_startDt} and #{sch_endDt} + + AND A.GUARANTEE_ISSUE_DATE =]]> #{sch_startDt} + ' 00:00:00' + AND A.GUARANTEE_ISSUE_DATE #{sch_endDt} + ' 23:59:59' - AND A.GUARANTEE_APPLY_DATE BETWEEN #{sch_startDt} and #{sch_endDt} + AND A.GUARANTEE_APPLY_DATE =]]> #{sch_startDt} + ' 00:00:00' + AND A.GUARANTEE_APPLY_DATE #{sch_endDt} + ' 23:59:59'