From ded370a3480474fd3e49d2c48e8a250b1476e60a Mon Sep 17 00:00:00 2001 From: cha Date: Wed, 23 Apr 2025 16:01:59 +0900 Subject: [PATCH] =?UTF-8?q?986=20-=20=EC=8B=9C=EA=B3=B5=EC=82=AC=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EC=B6=94=EA=B0=80,=20=EC=8B=9C=EA=B3=B5=EC=82=AC(u?= =?UTF-8?q?serId)=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A7=8C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/interplug/qcast/biz/login/dto/UserResponse.java | 2 ++ .../interplug/qcast/biz/mainPage/MainPageController.java | 6 ++++-- .../com/interplug/qcast/biz/object/dto/ObjectRequest.java | 3 +++ src/main/resources/mappers/object/objectMapper.xml | 6 ++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java b/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java index b6cd3e48..b59643d0 100644 --- a/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java +++ b/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java @@ -25,4 +25,6 @@ public class UserResponse { private String storeLvl; // Store Level private String groupId; // groupId private String custCd; // custCd + //시공사 번호 + private String builderNo; } diff --git a/src/main/java/com/interplug/qcast/biz/mainPage/MainPageController.java b/src/main/java/com/interplug/qcast/biz/mainPage/MainPageController.java index 4c608e19..443486cb 100644 --- a/src/main/java/com/interplug/qcast/biz/mainPage/MainPageController.java +++ b/src/main/java/com/interplug/qcast/biz/mainPage/MainPageController.java @@ -21,9 +21,9 @@ public class MainPageController { private final ObjectService objectService; @Operation(description = "메인 물건정보 목록을 조회한다.") - @GetMapping("/object/{saleStoreId}/list") + @GetMapping("/object/{saleStoreId}/{userId}/{builderNo}/list") @ResponseStatus(HttpStatus.OK) - public MainPageResponse selectObjectList(@PathVariable String saleStoreId) throws Exception { + public MainPageResponse selectObjectList(@PathVariable String saleStoreId, @PathVariable String userId, @PathVariable String builderNo) throws Exception { MainPageResponse mainPageResponse = new MainPageResponse(); // 판매점명 조회 @@ -39,6 +39,8 @@ public class MainPageController { // 물건정보 목록 조회 ObjectRequest objectRequest = new ObjectRequest(); objectRequest.setSaleStoreId(saleStoreId); + objectRequest.setUserId(userId); + objectRequest.setBuilderNo(builderNo); List objectList = objectService.selectObjectMainList(objectRequest); mainPageResponse.setObjectList(objectList); diff --git a/src/main/java/com/interplug/qcast/biz/object/dto/ObjectRequest.java b/src/main/java/com/interplug/qcast/biz/object/dto/ObjectRequest.java index c49a275d..67f838d1 100644 --- a/src/main/java/com/interplug/qcast/biz/object/dto/ObjectRequest.java +++ b/src/main/java/com/interplug/qcast/biz/object/dto/ObjectRequest.java @@ -170,4 +170,7 @@ public class ObjectRequest { @Schema(description = "종료 Row") private String endRow; + + @Schema(description = "시공사 번호") + private String builderNo; } diff --git a/src/main/resources/mappers/object/objectMapper.xml b/src/main/resources/mappers/object/objectMapper.xml index ec4969c9..10eb9f32 100644 --- a/src/main/resources/mappers/object/objectMapper.xml +++ b/src/main/resources/mappers/object/objectMapper.xml @@ -183,6 +183,9 @@ FROM T_OBJECT O WITH (NOLOCK) INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK) ON O.OBJECT_NO = OI.OBJECT_NO + + AND OI.CREATE_USER = #{userId} + INNER JOIN M_SALES_STORE S WITH (NOLOCK) ON O.SALE_STORE_ID = S.SALE_STORE_ID @@ -274,6 +277,9 @@ FROM T_OBJECT O WITH (NOLOCK) INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK) ON O.OBJECT_NO = OI.OBJECT_NO + + AND OI.CREATE_USER = #{userId} + INNER JOIN M_SALES_STORE S WITH (NOLOCK) ON O.SALE_STORE_ID = S.SALE_STORE_ID