From 8da9dd6c018f6e419ac4cf1618f7bf49488b112b Mon Sep 17 00:00:00 2001 From: "DESKTOP-6ARNG1Q\\dlsgk" Date: Thu, 19 Sep 2024 17:24:17 +0900 Subject: [PATCH 1/4] =?UTF-8?q?USER=20=EB=8F=99=EA=B8=B0=ED=99=94(?= =?UTF-8?q?=EC=82=AD=EC=A0=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/interplug/qcast/biz/user/UserMapper.java | 3 +++ .../java/com/interplug/qcast/biz/user/UserService.java | 7 ++++++- .../java/com/interplug/qcast/biz/user/dto/UserRequest.java | 1 + src/main/resources/mappers/user/userMapper.xml | 6 ++++++ 4 files changed, 16 insertions(+), 1 deletion(-) 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 c0f500af..6d331899 100644 --- a/src/main/java/com/interplug/qcast/biz/user/UserMapper.java +++ b/src/main/java/com/interplug/qcast/biz/user/UserMapper.java @@ -12,4 +12,7 @@ public interface UserMapper { int setStoreSapCdSave(StoreRequest storeReq); int setUserSave(UserRequest userReqList); + + int deleteUser(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 ccba5e5f..2423ca62 100644 --- a/src/main/java/com/interplug/qcast/biz/user/UserService.java +++ b/src/main/java/com/interplug/qcast/biz/user/UserService.java @@ -21,7 +21,12 @@ public class UserService { int resultCnt = 0; if (!userReqList.isEmpty()) { for (UserRequest userReq : userReqList) { - resultCnt += userMapper.setUserSave(userReq); + if ("1".equals(userReq.getDelFlg())) { // 삭제 + resultCnt += userMapper.deleteUser(userReq); + } else { + resultCnt += userMapper.setUserSave(userReq); + } + } } return resultCnt; diff --git a/src/main/java/com/interplug/qcast/biz/user/dto/UserRequest.java b/src/main/java/com/interplug/qcast/biz/user/dto/UserRequest.java index 4db72aef..a1c58819 100644 --- a/src/main/java/com/interplug/qcast/biz/user/dto/UserRequest.java +++ b/src/main/java/com/interplug/qcast/biz/user/dto/UserRequest.java @@ -18,6 +18,7 @@ public class UserRequest { private String registDatetime; private String lastEditDatetime; private String lastEditUser; + private String delFlg; } diff --git a/src/main/resources/mappers/user/userMapper.xml b/src/main/resources/mappers/user/userMapper.xml index e2222627..732a0011 100644 --- a/src/main/resources/mappers/user/userMapper.xml +++ b/src/main/resources/mappers/user/userMapper.xml @@ -191,4 +191,10 @@ , #{lastEditUser} ); + + + /* sqlid : com.interplug.qcast.user.deleteUser */ + DELETE FROM M_USER + WHERE USER_ID = #{userId} + \ No newline at end of file From e55f0a6b006b433c99140287df30536ac16ae57d Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 19 Sep 2024 18:55:29 +0900 Subject: [PATCH 2/4] =?UTF-8?q?qsp=20=EA=B3=B5=ED=86=B5=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EB=8F=99=EA=B8=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/commCode/CommCodeController.java | 31 +++------------ .../qcast/biz/commCode/CommCodeMapper.java | 7 ++-- .../qcast/biz/commCode/CommCodeService.java | 38 +++++++++---------- .../qcast/biz/commCode/dto/CodeReq.java | 15 ++++++++ .../{CommCodeRequest.java => CodeRes.java} | 15 ++++---- .../commCode/dto/CommCodeDetailRequest.java | 35 ----------------- .../commCode/dto/CommCodeHeaderRequest.java | 35 ----------------- .../biz/commCode/dto/CommCodeResponse.java | 18 --------- .../mappers/commCode/commCodeMapper.xml | 4 +- 9 files changed, 49 insertions(+), 149 deletions(-) create mode 100644 src/main/java/com/interplug/qcast/biz/commCode/dto/CodeReq.java rename src/main/java/com/interplug/qcast/biz/commCode/dto/{CommCodeRequest.java => CodeRes.java} (83%) delete mode 100644 src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeDetailRequest.java delete mode 100644 src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeHeaderRequest.java delete mode 100644 src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeResponse.java diff --git a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeController.java b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeController.java index 9c63cb50..3a188768 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeController.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeController.java @@ -1,15 +1,13 @@ package com.interplug.qcast.biz.commCode; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import com.interplug.qcast.biz.commCode.dto.CodeReq; import com.interplug.qcast.biz.commCode.dto.CommCodeApiResponse; -import com.interplug.qcast.biz.commCode.dto.CommCodeDetailRequest; -import com.interplug.qcast.biz.commCode.dto.CommCodeHeaderRequest; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -23,31 +21,12 @@ import lombok.extern.slf4j.Slf4j; public class CommCodeController { private final CommCodeService commCodeService; - @Operation(description = "공통코드 COMM_H 정보를 등록/수정 한다.(동기화)") - @PutMapping("/qc-comm-h-update") + @Operation(description = "공통코드 정보를 등록/수정 한다.(동기화)") + @PutMapping("/qc-comm-update") @ResponseStatus(HttpStatus.OK) - public CommCodeApiResponse setQcCommCdYn(@RequestBody List headReqList) { + public CommCodeApiResponse setQcCommCdYn(@RequestBody CodeReq codeReq) { CommCodeApiResponse codeResponse = new CommCodeApiResponse(); - - int resultCnt = commCodeService.setCommHUpdate(headReqList); - if (resultCnt > 0) - codeResponse.setCode("200"); - else - codeResponse.setCode("500"); - - return codeResponse; - - } - - @Operation(description = "공통코드 COMM_L 정보를 등록/수정 한다.(동기화)") - @PutMapping("/qc-comm-l-update") - @ResponseStatus(HttpStatus.OK) - public CommCodeApiResponse setCommLUpdate( - @RequestBody List detailReqList) { - CommCodeApiResponse codeResponse = new CommCodeApiResponse(); - - int resultCnt = commCodeService.setCommLUpdate(detailReqList); - + int resultCnt = commCodeService.setCommHUpdate(codeReq); if (resultCnt > 0) codeResponse.setCode("200"); else diff --git a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeMapper.java b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeMapper.java index e63b3f45..bddbbbc0 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeMapper.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeMapper.java @@ -1,14 +1,13 @@ package com.interplug.qcast.biz.commCode; import org.apache.ibatis.annotations.Mapper; -import com.interplug.qcast.biz.commCode.dto.CommCodeDetailRequest; -import com.interplug.qcast.biz.commCode.dto.CommCodeHeaderRequest; +import com.interplug.qcast.biz.commCode.dto.CodeRes; @Mapper public interface CommCodeMapper { - int setCommHUpdate(CommCodeHeaderRequest codeReq); + int setCommHUpdate(CodeRes codeRes); - int setCommLUpdate(CommCodeDetailRequest codeReq); + int setCommLUpdate(CodeRes codeRes); } diff --git a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java index 63f62ac3..8c310e69 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java @@ -1,9 +1,8 @@ package com.interplug.qcast.biz.commCode; -import java.util.List; import org.springframework.stereotype.Service; -import com.interplug.qcast.biz.commCode.dto.CommCodeDetailRequest; -import com.interplug.qcast.biz.commCode.dto.CommCodeHeaderRequest; +import com.interplug.qcast.biz.commCode.dto.CodeReq; +import com.interplug.qcast.biz.commCode.dto.CodeRes; import lombok.RequiredArgsConstructor; @Service @@ -12,33 +11,30 @@ public class CommCodeService { private final CommCodeMapper commCodeMapper; - public int setCommHUpdate(List headReqList) { + public int setCommHUpdate(CodeReq codeReq) { int resultCnt = 0; - if (!headReqList.isEmpty()) { - for (CommCodeHeaderRequest headReq : headReqList) { - if ("Y".equals(headReq.getQcCommYn())) { - headReq.setDelFlg(0); + if (!codeReq.getApiHeadCdList1().isEmpty()) { + for (CodeRes codeRes : codeReq.getApiHeadCdList1()) { + if ("Y".equals(codeRes.getQcCommYn())) { + codeRes.setDelFlg(0); } else { - headReq.setDelFlg(1); + codeRes.setDelFlg(1); } - resultCnt += commCodeMapper.setCommHUpdate(headReq); + resultCnt += commCodeMapper.setCommHUpdate(codeRes); } } - return resultCnt; - } - public int setCommLUpdate(List detailReqList) { - int resultCnt = 0; - if (!detailReqList.isEmpty()) { - for (CommCodeDetailRequest detailReq : detailReqList) { - if ("A".equals(detailReq.getClStatCd())) { - detailReq.setClDelFlg(0); + if (!codeReq.getApiCommCdList1().isEmpty()) { + + for (CodeRes codeRes : codeReq.getApiCommCdList1()) { + if ("A".equals(codeRes.getClStatCd())) { + codeRes.setClDelFlg(0); } else { - detailReq.setClDelFlg(1); + codeRes.setClDelFlg(1); } - resultCnt += commCodeMapper.setCommLUpdate(detailReq); - } + resultCnt += commCodeMapper.setCommLUpdate(codeRes); + } } return resultCnt; } diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeReq.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeReq.java new file mode 100644 index 00000000..84a885bd --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeReq.java @@ -0,0 +1,15 @@ +package com.interplug.qcast.biz.commCode.dto; + +import java.util.List; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +public class CodeReq { + + private List apiHeadCdList1; + private List apiCommCdList1; +} diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeRequest.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeRes.java similarity index 83% rename from src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeRequest.java rename to src/main/java/com/interplug/qcast/biz/commCode/dto/CodeRes.java index edc633c5..48c3199f 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeRequest.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/dto/CodeRes.java @@ -4,12 +4,14 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; @Getter @Setter +@ToString @NoArgsConstructor @AllArgsConstructor -public class CommCodeRequest { +public class CodeRes { private String headCd; private String headId; private String headNm; @@ -26,9 +28,7 @@ public class CommCodeRequest { private String refNum4; private String refNum5; private String remarks; - private String delFlg; - // private String regDt; - // private String uptDt; + private Integer delFlg; private String clHeadCd; private String clCode; @@ -48,10 +48,9 @@ public class CommCodeRequest { private Integer clRefNum5; private Integer clPriority; private String clRefCnt; - private String clDelFlg; - // private String clRegDt; - // private String clUptDt; + private String clStatCd; + private Integer clDelFlg; - private String qcGubun; + private String qcCommYn; } diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeDetailRequest.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeDetailRequest.java deleted file mode 100644 index a1838e40..00000000 --- a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeDetailRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.interplug.qcast.biz.commCode.dto; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@ToString -public class CommCodeDetailRequest { - private String clHeadCd; - private String clCode; - private String clReadCd; - private String clCodeNm; - private String clCodeJp; - private String clCode4Th; - private String clRefChr1; - private String clRefChr2; - private String clRefChr3; - private String clRefChr4; - private String clRefChr5; - private Integer clRefNum1; - private Integer clRefNum2; - private Integer clRefNum3; - private Integer clRefNum4; - private Integer clRefNum5; - private Integer clPriority; - private String clRefCnt; - private Integer clDelFlg; - private String clStatCd; -} diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeHeaderRequest.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeHeaderRequest.java deleted file mode 100644 index 9227b3a3..00000000 --- a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeHeaderRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.interplug.qcast.biz.commCode.dto; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@ToString -public class CommCodeHeaderRequest { - - private String headCd; - private String headId; - private String headNm; - private String headJp; - private String head4Th; - private String refChr1; - private String refChr2; - private String refChr3; - private String refChr4; - private String refChr5; - private String refNum1; - private String refNum2; - private String refNum3; - private String refNum4; - private String refNum5; - private String remarks; - private String qcCommYn; - private Integer delFlg; - -} diff --git a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeResponse.java b/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeResponse.java deleted file mode 100644 index b4408183..00000000 --- a/src/main/java/com/interplug/qcast/biz/commCode/dto/CommCodeResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.interplug.qcast.biz.commCode.dto; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class CommCodeResponse { - - private String code; - private String message; - - -} diff --git a/src/main/resources/mappers/commCode/commCodeMapper.xml b/src/main/resources/mappers/commCode/commCodeMapper.xml index 775dd0ff..46267370 100644 --- a/src/main/resources/mappers/commCode/commCodeMapper.xml +++ b/src/main/resources/mappers/commCode/commCodeMapper.xml @@ -2,7 +2,7 @@ - + /* sqlid : com.interplug.qcast.commCode.setCommHUpdate */ MERGE M_COMM_H AS A USING @@ -73,7 +73,7 @@ ); - + /* sqlid : com.interplug.qcast.commCode.setCommLUpdate */ MERGE M_COMM_L AS A USING From 90364b8185eba93ca303110df1db7660b4d0b093 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6ARNG1Q\\dlsgk" Date: Fri, 20 Sep 2024 14:14:22 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20MERGE=20DELETE=20=EC=B6=94=EA=B0=80,=20STORE=20?= =?UTF-8?q?=EC=A6=90=EA=B2=A8=EC=B0=BE=EA=B8=B0=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreFavoriteController.java | 34 +++++++++++ .../storeFavorite/StoreFavoriteMapper.java | 10 +++ .../storeFavorite/StoreFavoriteService.java | 17 ++++++ .../dto/StoreFavoriteRequest.java | 16 +++++ .../qcast/biz/user/UserController.java | 14 +++++ .../interplug/qcast/biz/user/UserMapper.java | 2 - .../interplug/qcast/biz/user/UserService.java | 14 ++--- .../storeFavorite/storeFavoriteMapper.xml | 34 +++++++++++ .../resources/mappers/user/userMapper.xml | 61 ++++++++++++++----- 9 files changed, 179 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteController.java create mode 100644 src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteMapper.java create mode 100644 src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteService.java create mode 100644 src/main/java/com/interplug/qcast/biz/storeFavorite/dto/StoreFavoriteRequest.java create mode 100644 src/main/resources/mappers/storeFavorite/storeFavoriteMapper.xml diff --git a/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteController.java b/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteController.java new file mode 100644 index 00000000..9813d463 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteController.java @@ -0,0 +1,34 @@ +package com.interplug.qcast.biz.storeFavorite; + +import com.interplug.qcast.biz.storeFavorite.dto.StoreFavoriteRequest; +import com.interplug.qcast.biz.user.dto.UserResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequestMapping("/api/store-favorite") +@RequiredArgsConstructor +@Tag(name = "StoreFavorite", description = "Store Favorite 관련 API") +public class StoreFavoriteController { + private final StoreFavoriteService storeFavService; + + @Operation(description = "Store Favorite 정보를 등록/수정 한다.(동기화)") + @PutMapping("/store-favorite-save") + @ResponseStatus(HttpStatus.OK) + public UserResponse setStoreFavoriteSave(@RequestBody StoreFavoriteRequest req) { + UserResponse userResponse = new UserResponse(); + + int resultCnt = storeFavService.setStoreFavoriteSave(req); + + if (resultCnt > 0) userResponse.setCode("200"); + else userResponse.setCode("500"); + + return userResponse; + } + +} \ No newline at end of file diff --git a/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteMapper.java b/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteMapper.java new file mode 100644 index 00000000..2b7e1593 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteMapper.java @@ -0,0 +1,10 @@ +package com.interplug.qcast.biz.storeFavorite; + +import com.interplug.qcast.biz.storeFavorite.dto.StoreFavoriteRequest; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface StoreFavoriteMapper { + + int setStoreFavoriteSave(StoreFavoriteRequest req); +} \ No newline at end of file diff --git a/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteService.java b/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteService.java new file mode 100644 index 00000000..0b9b39b1 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/storeFavorite/StoreFavoriteService.java @@ -0,0 +1,17 @@ +package com.interplug.qcast.biz.storeFavorite; + +import com.interplug.qcast.biz.storeFavorite.dto.StoreFavoriteRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class StoreFavoriteService { + private final StoreFavoriteMapper storeFavoriteMapper; + + public int setStoreFavoriteSave(StoreFavoriteRequest req) { + return storeFavoriteMapper.setStoreFavoriteSave(req); + } + + +} diff --git a/src/main/java/com/interplug/qcast/biz/storeFavorite/dto/StoreFavoriteRequest.java b/src/main/java/com/interplug/qcast/biz/storeFavorite/dto/StoreFavoriteRequest.java new file mode 100644 index 00000000..885b4237 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/storeFavorite/dto/StoreFavoriteRequest.java @@ -0,0 +1,16 @@ +package com.interplug.qcast.biz.storeFavorite.dto; + +import lombok.Data; + +@Data +public class StoreFavoriteRequest { + private String userId; + private String saleStoreId; + private String dispOrder; + private String delFlg; + private String registDatetime; + private String lastEditDatetime; +} + + + 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 301307bd..df4f8010 100644 --- a/src/main/java/com/interplug/qcast/biz/user/UserController.java +++ b/src/main/java/com/interplug/qcast/biz/user/UserController.java @@ -47,4 +47,18 @@ public class UserController { return userResponse; } + + @Operation(description = "판매점 Sap 정보를 등록/수정 한다.(동기화)") + @PutMapping("/store-sap-info-save") + @ResponseStatus(HttpStatus.OK) + public UserResponse setStoreSapCdSave(@RequestBody StoreRequest storeReq) { + UserResponse userResponse = new UserResponse(); + + int resultCnt = userService.setStoreSapCdSave(storeReq); + + if (resultCnt > 0) userResponse.setCode("200"); + else userResponse.setCode("500"); + + return userResponse; + } } 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 6d331899..abfcba5e 100644 --- a/src/main/java/com/interplug/qcast/biz/user/UserMapper.java +++ b/src/main/java/com/interplug/qcast/biz/user/UserMapper.java @@ -13,6 +13,4 @@ public interface UserMapper { int setUserSave(UserRequest userReqList); - int deleteUser(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 2423ca62..e28559b2 100644 --- a/src/main/java/com/interplug/qcast/biz/user/UserService.java +++ b/src/main/java/com/interplug/qcast/biz/user/UserService.java @@ -13,23 +13,23 @@ public class UserService { private final UserMapper userMapper; public int setStoreSave(StoreRequest storeReq) { + int resultCnt = userMapper.setStoreSave(storeReq); userMapper.setStoreSapCdSave(storeReq); - return userMapper.setStoreSave(storeReq); + return resultCnt; } public int setUserSave(List userReqList) { int resultCnt = 0; if (!userReqList.isEmpty()) { for (UserRequest userReq : userReqList) { - if ("1".equals(userReq.getDelFlg())) { // 삭제 - resultCnt += userMapper.deleteUser(userReq); - } else { - resultCnt += userMapper.setUserSave(userReq); - } - + resultCnt += userMapper.setUserSave(userReq); } } return resultCnt; } + public int setStoreSapCdSave(StoreRequest storeReq) { + return userMapper.setStoreSapCdSave(storeReq); + } + } diff --git a/src/main/resources/mappers/storeFavorite/storeFavoriteMapper.xml b/src/main/resources/mappers/storeFavorite/storeFavoriteMapper.xml new file mode 100644 index 00000000..9d4bf28a --- /dev/null +++ b/src/main/resources/mappers/storeFavorite/storeFavoriteMapper.xml @@ -0,0 +1,34 @@ + + + + + + /* sqlid : com.interplug.qcast.storeFavorite.setStoreFavoriteSave */ + MERGE M_SALES_STORE_FAV AS A + USING + ( SELECT #{userId} AS USER_ID, #{saleStoreId} AS SALE_STORE_ID ) AS D + ON (A.USER_ID = D.USER_ID AND A.SALE_STORE_ID = D.SALE_STORE_ID + ) + WHEN MATCHED THEN + UPDATE SET + DEL_FLG = #{delFlg} + , DISP_ORDER = #{dispOrder} + , LAST_EDIT_DATETIME = #{lastEditDatetime} + WHEN NOT MATCHED THEN + INSERT ( + USER_ID + , SALE_STORE_ID + , DISP_ORDER + , DEL_FLG + , REGIST_DATETIME + , LAST_EDIT_DATETIME + ) VALUES ( + #{userId} + , #{saleStoreId} + , #{dispOrder} + , #{delFlg} + , #{registDatetime} + , #{lastEditDatetime} + ); + + diff --git a/src/main/resources/mappers/user/userMapper.xml b/src/main/resources/mappers/user/userMapper.xml index 732a0011..c07e355f 100644 --- a/src/main/resources/mappers/user/userMapper.xml +++ b/src/main/resources/mappers/user/userMapper.xml @@ -6,20 +6,55 @@ /* 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) + WITH SALES_STORE_CTE AS ( + SELECT + SALE_STORE_ID + , SALE_STORE_NAME + , SALE_STORE_LEVEL + , FIRST_AGENT_ID + , PARENT_SALE_AGENT_ID + , DEL_FLG + FROM M_SALES_STORE WITH(NOLOCK) + WHERE SALE_STORE_ID = #{saleStoreId} + AND APPROVE_FLG = '2' + UNION ALL + SELECT + A.SALE_STORE_ID + , A.SALE_STORE_NAME + , A.SALE_STORE_LEVEL + , A.FIRST_AGENT_ID + , A.PARENT_SALE_AGENT_ID + , A.DEL_FLG + FROM M_SALES_STORE A WITH(NOLOCK) + INNER JOIN SALES_STORE_CTE B + ON A.PARENT_SALE_AGENT_ID = B.SALE_STORE_ID + WHERE A.APPROVE_FLG = '2' + ) + MERGE INTO M_SALES_STORE_ID_FOR_SAP AS A + USING ( + SELECT + CASE WHEN SALE_STORE_LEVEL = '1' THEN 'Y' ELSE 'N' END AS FIRST_AGENT_YN + , SALE_STORE_ID + , SALE_STORE_NAME + , SALE_STORE_LEVEL + , FIRST_AGENT_ID + , PARENT_SALE_AGENT_ID + , DEL_FLG + FROM SALES_STORE_CTE + ) AS D + ON A.SALE_STORE_ID = D.SALE_STORE_ID + WHEN MATCHED AND D.DEL_FLG = '1' THEN + DELETE WHEN MATCHED THEN UPDATE SET SAP_SALES_STORE_CD = #{sapSalesStoreCd} WHEN NOT MATCHED THEN INSERT ( - SALE_STORE_ID - , SAP_SALES_STORE_CD + SALE_STORE_ID + , SAP_SALES_STORE_CD ) VALUES ( - #{saleStoreId} - , #{sapSalesStoreCd} + #{saleStoreId} + , #{sapSalesStoreCd} ); @@ -138,8 +173,11 @@ /* sqlid : com.interplug.qcast.user.setUserSave */ MERGE M_USER AS A USING - ( SELECT #{userId} AS USER_ID ) AS D + ( SELECT #{userId} AS USER_ID + , #{delFlg} AS DEL_FLG ) AS D ON (A.USER_ID = D.USER_ID) + WHEN MATCHED AND D.DEL_FLG = '1' THEN + DELETE WHEN MATCHED THEN UPDATE SET SALE_STORE_ID = #{saleStoreId} @@ -192,9 +230,4 @@ ); - - /* sqlid : com.interplug.qcast.user.deleteUser */ - DELETE FROM M_USER - WHERE USER_ID = #{userId} - \ No newline at end of file From c5ca51595307f3954fdc5b9c7c1ed4b59be8e089 Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 20 Sep 2024 14:33:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?QSP=20=EA=B3=B5=ED=86=B5=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EB=8F=99=EA=B8=B0=ED=99=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/commCode/commCodeMapper.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/mappers/commCode/commCodeMapper.xml b/src/main/resources/mappers/commCode/commCodeMapper.xml index 46267370..5c8af6e0 100644 --- a/src/main/resources/mappers/commCode/commCodeMapper.xml +++ b/src/main/resources/mappers/commCode/commCodeMapper.xml @@ -27,7 +27,6 @@ , REF_NUM5 = #{refNum5} , REMARKS = #{remarks} , DEL_FLG = #{delFlg} - , REG_DT = GETDATE() , UPT_DT = GETDATE() WHEN NOT MATCHED THEN INSERT ( @@ -100,7 +99,6 @@ , PRIORITY = #{clPriority} , REF_CNT = #{clRefCnt} , DEL_FLG = #{clDelFlg} - , REG_DT = GETDATE() , UPT_DT = GETDATE() WHEN NOT MATCHED THEN INSERT (