From cec97c4e3d63b36fc34176b3f93b5eb30c3b2ab4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6ARNG1Q\\dlsgk" Date: Tue, 24 Sep 2024 10:44:56 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EC=A6=9D=EC=84=9C=EB=B0=9C=ED=96=89?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excelDown/dto/WrntIsncCmplRequest.java | 2 + .../mappers/excelDown/excelDownMapper.xml | 141 ++++++++++-------- 2 files changed, 79 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplRequest.java b/src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplRequest.java index 276b869e..0fa2cffd 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplRequest.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/dto/WrntIsncCmplRequest.java @@ -21,4 +21,6 @@ public class WrntIsncCmplRequest { private String sch_objectNm; @Schema(description = "판매대리점Id") private String sch_saleStoreId; + @Schema(description = "보증서번호") + private String sch_warrantyNo; } \ No newline at end of file diff --git a/src/main/resources/mappers/excelDown/excelDownMapper.xml b/src/main/resources/mappers/excelDown/excelDownMapper.xml index 8ddc2089..811fcdb7 100644 --- a/src/main/resources/mappers/excelDown/excelDownMapper.xml +++ b/src/main/resources/mappers/excelDown/excelDownMapper.xml @@ -128,52 +128,52 @@ , CONVERT(varchar, A.DRAWING_ESTIMATE_CREATE_DATE, 120) AS DRAWING_ESTIMATE_CREATE_DATE/* プラン見積作成日 */ --> FROM T_OBJECT B - LEFT JOIN T_PLAN A + LEFT OUTER JOIN T_PLAN A ON A.OBJECT_NO = B.OBJECT_NO - LEFT JOIN M_COMM_L C1 + LEFT OUTER JOIN M_COMM_L C1 ON C1.CODE = B.OBJECT_STATUS_ID AND C1.HEAD_CD = '201700' - LEFT JOIN M_WORK_PROGRESS D + LEFT OUTER JOIN M_WORK_PROGRESS D ON B.WORK_NO = D.WORK_NO - LEFT JOIN M_PREFECTURE E + LEFT OUTER JOIN M_PREFECTURE E ON B.PREF_ID = E.PREF_ID - - LEFT JOIN M_SALES_STORE G + + LEFT OUTER JOIN M_SALES_STORE G ON B.SALE_STORE_ID = G.SALE_STORE_ID /*본인정보*/ - LEFT JOIN T_STATISTICS H + LEFT OUTER JOIN T_STATISTICS H ON A.OBJECT_NO = H.OBJECT_NO and A.PLAN_NO = H.PLAN_NO - - - - LEFT JOIN M_BUSINESS_CHARGER L + + + + LEFT OUTER JOIN M_BUSINESS_CHARGER L ON G.BUSINESS_CHARGER_CD = L.BUSINESS_CHARGER_CD - LEFT JOIN M_BUSINESS_TEAM M + LEFT OUTER JOIN M_BUSINESS_TEAM M ON L.BUSINESS_TEAM_CD = M.BUSINESS_TEAM_CD - LEFT JOIN M_COMM_L C2 + LEFT OUTER JOIN M_COMM_L C2 ON C2.CODE = A.ROOF_KIND_ID AND C2.HEAD_CD = '201800' - LEFT JOIN M_COMM_L C3 + LEFT OUTER JOIN M_COMM_L C3 ON C3.CODE = A.ROOF_MATERIAL_ID AND C3.HEAD_CD = '201900' - LEFT JOIN M_SUPPORT_METHOD P + LEFT OUTER JOIN M_SUPPORT_METHOD P ON A.SUPPORT_METHOD_ID = P.SUPPORT_METHOD_ID - LEFT JOIN M_COMM_L C4 + LEFT OUTER JOIN M_COMM_L C4 ON C4.CODE = A.CONSTRUCT_SPECIFICATION AND C4.HEAD_CD = '201300' - - - - LEFT JOIN T_ROOF_INSTALLED_HEIGHT U + + + + LEFT OUTER JOIN T_ROOF_INSTALLED_HEIGHT U ON A.OBJECT_NO = U.OBJECT_NO - LEFT JOIN T_APPROVAL_CAPATICY V + LEFT OUTER JOIN T_APPROVAL_CAPATICY V ON A.OBJECT_NO = V.OBJECT_NO AND A.PLAN_NO = V.PLAN_NO - LEFT JOIN T_MENSODO W + LEFT OUTER JOIN T_MENSODO W ON A.OBJECT_NO = W.OBJECT_NO - LEFT JOIN M_USER X + LEFT OUTER JOIN M_USER X ON A.LAST_EDIT_USER = X.USER_ID - LEFT JOIN M_SALES_STORE Y + LEFT OUTER JOIN M_SALES_STORE Y ON G.FIRST_AGENT_ID = Y.SALE_STORE_ID /*1차점정보*/ WHERE A.DEL_FLG = 0 AND B.DEL_FLG = 0 @@ -225,31 +225,31 @@ , D.FIRST_AGENT_FLG /* 一次代理店フラグ */ --> FROM T_OBJECT C - LEFT JOIN M_SALES_STORE D + LEFT OUTER JOIN M_SALES_STORE D ON C.SALE_STORE_ID = D.SALE_STORE_ID - LEFT JOIN T_PLAN B + LEFT OUTER JOIN T_PLAN B ON C.OBJECT_NO = B.OBJECT_NO LEFT OUTER JOIN T_PART_ESTIMATE A ON A.OBJECT_NO = B.OBJECT_NO AND A.PLAN_NO = B.PLAN_NO - LEFT JOIN T_STATISTICS E + LEFT OUTER JOIN T_STATISTICS E ON A.OBJECT_NO = E.OBJECT_NO AND A.PLAN_NO = E.PLAN_NO - LEFT JOIN M_BUSINESS_GROUP F + LEFT OUTER JOIN M_BUSINESS_GROUP F ON C.BUSINESS_GROUP_CD = F.BUSINESS_GROUP_CD AND F.DEL_FLG = 0 - LEFT JOIN M_BUSINESS_CHARGER G + LEFT OUTER JOIN M_BUSINESS_CHARGER G ON C.BUSINESS_CHARGER_CD = G.BUSINESS_CHARGER_CD AND G.DEL_FLG = 0 - LEFT JOIN M_SALES_STORE H + LEFT OUTER JOIN M_SALES_STORE H ON D.FIRST_AGENT_ID = H.SALE_STORE_ID AND H.DEL_FLG = 0 - LEFT JOIN M_PREFECTURE I + LEFT OUTER JOIN M_PREFECTURE I ON C.PREF_ID = I.PREF_ID - LEFT JOIN M_BUSINESS_CHARGER J + LEFT OUTER JOIN M_BUSINESS_CHARGER J ON D.BUSINESS_CHARGER_CD = J.BUSINESS_CHARGER_CD AND J.DEL_FLG = 0 - LEFT JOIN M_BUSINESS_TEAM K + LEFT OUTER JOIN M_BUSINESS_TEAM K ON J.BUSINESS_TEAM_CD = K.BUSINESS_TEAM_CD AND K.DEL_FLG = 0 WHERE C.DEL_FLG = 0 @@ -343,11 +343,11 @@ END AS EQUIP_GUARANTEE_YEARS_RETROACT /* 기기보증연수(소급) 機器保証年数_遡及 */ , CAST(A.SUNSHINE_COPENSATE_YEARS AS NVARCHAR) + '年' AS SUNSHINE_COPENSATE_YEARS /* 일조보상연수 日照補償年数 */ FROM T_GUARANTEE A - LEFT JOIN M_PREFECTURE B + LEFT OUTER JOIN M_PREFECTURE B ON A.GUARANTEE_RECEIVE_USER_PREF_ID = B.PREF_ID - LEFT JOIN M_PREFECTURE C + LEFT OUTER JOIN M_PREFECTURE C ON A.SETUP_PLACE_PREF_ID = C.PREF_ID - LEFT JOIN T_OBJECT D + LEFT OUTER JOIN T_OBJECT D ON A.OBJECT_NO = D.OBJECT_NO WHERE D.DEL_FLG != 1 AND D.ESTIMATE_DETAIL_CREATE_DATE #{sch_baseDt} + ' 23:59:59' /* 과거일자 기준일 */ @@ -431,33 +431,46 @@ , A.LAST_EDIT_USER /* 최종 업데이트자 */ , A.LAST_EDIT_DATETIME /* 최종 갱신시 */ FROM T_GUARANTEE A - LEFT JOIN T_OBJECT D - ON A.OBJECT_NO = D.OBJECT_NO - WHERE D.DEL_FLG = 0 - - - - - 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 =]]> #{sch_startDt} + ' 00:00:00' - AND A.GUARANTEE_APPLY_DATE #{sch_endDt} + ' 23:59:59' - - - - - - AND A.OBJECT_NO LIKE '%' + #{sch_objectNo} + '%' - - - AND A.SETUP_PLACE_OBJECT_NAME LIKE '%' + #{sch_objectNm} + '%' - - - AND D.SALE_STORE_ID = #{sch_saleStoreId} - - - + LEFT OUTER JOIN T_OBJECT B + ON A.OBJECT_NO = B.OBJECT_NO + AND B.DEL_FLG = 0 + LEFT OUTER JOIN W_WARRANTY C + ON A.OBJECT_NO = C.OBJECT_NO + + + + + + + + + + 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 =]]> #{sch_startDt} + ' 00:00:00' + AND A.GUARANTEE_APPLY_DATE #{sch_endDt} + ' 23:59:59' + + + + + + AND A.OBJECT_NO LIKE '%' + #{sch_objectNo} + '%' + + + AND A.SETUP_PLACE_OBJECT_NAME LIKE '%' + #{sch_objectNm} + '%' + + + AND B.SALE_STORE_ID = #{sch_saleStoreId} + + + AND C.WARRANTY_NO1 LIKE '%' + #{sch_warrantyNo} + '%' + + + + + + \ No newline at end of file