From 0bb248aa4f0047fceadae030901874061ebfeeab Mon Sep 17 00:00:00 2001 From: "DESKTOP-6ARNG1Q\\dlsgk" Date: Thu, 12 Sep 2024 17:51:12 +0900 Subject: [PATCH] =?UTF-8?q?User=20=EC=A0=95=EB=B3=B4=20=EB=8F=99=EA=B8=B0?= =?UTF-8?q?=ED=99=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/user/UserController.java | 5 ++-- .../interplug/qcast/biz/user/UserMapper.java | 2 ++ .../interplug/qcast/biz/user/UserService.java | 1 + .../qcast/biz/user/dto/StoreRequest.java | 1 + .../mappers/excelDown/excelDownMapper.xml | 6 ++-- .../resources/mappers/user/userMapper.xml | 29 +++++++++++++++---- 6 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/user/UserController.java b/src/main/java/com/interplug/qcast/biz/user/UserController.java index cda9bb95..301307bd 100644 --- a/src/main/java/com/interplug/qcast/biz/user/UserController.java +++ b/src/main/java/com/interplug/qcast/biz/user/UserController.java @@ -23,7 +23,7 @@ public class UserController { @Operation(description = "판매점 정보를 등록/수정 한다.(동기화)") @PutMapping("/store-save") @ResponseStatus(HttpStatus.OK) - public UserResponse setStoreInfo(@RequestBody StoreRequest storeReq) { + public UserResponse setStoreSave(@RequestBody StoreRequest storeReq) { UserResponse userResponse = new UserResponse(); int resultCnt = userService.setStoreSave(storeReq); @@ -36,7 +36,8 @@ public class UserController { @Operation(description = "user 정보를 등록/수정 한다.(동기화)") @PutMapping("/user-save") - public UserResponse updateUserInfo(@RequestBody List userReqList) { + @ResponseStatus(HttpStatus.OK) + public UserResponse setUserSave(@RequestBody List userReqList) { UserResponse userResponse = new UserResponse(); int resultCnt = userService.setUserSave(userReqList); diff --git a/src/main/java/com/interplug/qcast/biz/user/UserMapper.java b/src/main/java/com/interplug/qcast/biz/user/UserMapper.java index 1b982a71..c0f500af 100644 --- a/src/main/java/com/interplug/qcast/biz/user/UserMapper.java +++ b/src/main/java/com/interplug/qcast/biz/user/UserMapper.java @@ -9,5 +9,7 @@ public interface UserMapper { int setStoreSave(StoreRequest storeReq); + int setStoreSapCdSave(StoreRequest storeReq); + int setUserSave(UserRequest userReqList); } \ No newline at end of file diff --git a/src/main/java/com/interplug/qcast/biz/user/UserService.java b/src/main/java/com/interplug/qcast/biz/user/UserService.java index 9c65d631..ccba5e5f 100644 --- a/src/main/java/com/interplug/qcast/biz/user/UserService.java +++ b/src/main/java/com/interplug/qcast/biz/user/UserService.java @@ -13,6 +13,7 @@ public class UserService { private final UserMapper userMapper; public int setStoreSave(StoreRequest storeReq) { + userMapper.setStoreSapCdSave(storeReq); return userMapper.setStoreSave(storeReq); } diff --git a/src/main/java/com/interplug/qcast/biz/user/dto/StoreRequest.java b/src/main/java/com/interplug/qcast/biz/user/dto/StoreRequest.java index 59da54c6..25149c08 100644 --- a/src/main/java/com/interplug/qcast/biz/user/dto/StoreRequest.java +++ b/src/main/java/com/interplug/qcast/biz/user/dto/StoreRequest.java @@ -5,6 +5,7 @@ import lombok.Data; @Data public class StoreRequest { + private String sapSalesStoreCd; private String saleStoreId; private String saleStoreName; private String saleStoreNameKana; diff --git a/src/main/resources/mappers/excelDown/excelDownMapper.xml b/src/main/resources/mappers/excelDown/excelDownMapper.xml index f2f70a18..6e6f252d 100644 --- a/src/main/resources/mappers/excelDown/excelDownMapper.xml +++ b/src/main/resources/mappers/excelDown/excelDownMapper.xml @@ -178,7 +178,7 @@ 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} /* 과거일자 기준일 */ AND B.ESTIMATE_DETAIL_CREATE_DATE BETWEEN #{sch_startDt} and #{sch_endDt} @@ -255,7 +255,7 @@ 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} /* 과거일자 기준일 */ AND C.ESTIMATE_DETAIL_CREATE_DATE BETWEEN #{sch_startDt} and #{sch_endDt} @@ -349,7 +349,7 @@ 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} /* 과거일자 기준일 */ diff --git a/src/main/resources/mappers/user/userMapper.xml b/src/main/resources/mappers/user/userMapper.xml index 54b24a52..e2222627 100644 --- a/src/main/resources/mappers/user/userMapper.xml +++ b/src/main/resources/mappers/user/userMapper.xml @@ -2,13 +2,33 @@ + + + + /* sqlid : com.interplug.qcast.user.setStoreSapCdSave */ + MERGE M_SALES_STORE_ID_FOR_SAP AS A + USING + ( SELECT #{saleStoreId} AS SALE_STORE_ID ) AS D + ON (A.SALE_STORE_ID = D.SALE_STORE_ID) + WHEN MATCHED THEN + UPDATE SET + SAP_SALES_STORE_CD = #{sapSalesStoreCd} + WHEN NOT MATCHED THEN + INSERT ( + SALE_STORE_ID + , SAP_SALES_STORE_CD + ) VALUES ( + #{saleStoreId} + , #{sapSalesStoreCd} + ); + + /* sqlid : com.interplug.qcast.user.setStoreSave */ MERGE M_SALES_STORE AS A USING - ( SELECT #{saleStoreId} AS SALE_STORE_ID ) AS D - ON (A.SALE_STORE_ID = D.SALE_STORE_ID - ) + ( SELECT #{saleStoreId} AS SALE_STORE_ID ) AS D + ON (A.SALE_STORE_ID = D.SALE_STORE_ID) WHEN MATCHED THEN UPDATE SET SALE_STORE_NAME = #{saleStoreName} @@ -119,8 +139,7 @@ MERGE M_USER AS A USING ( SELECT #{userId} AS USER_ID ) AS D - ON (A.USER_ID = D.USER_ID - ) + ON (A.USER_ID = D.USER_ID) WHEN MATCHED THEN UPDATE SET SALE_STORE_ID = #{saleStoreId}