qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '986 - 시공사번호 추가, 시공사(userId) 데이터만 조회' (#15) from feature/cha into dev

Browse Source 
Reviewed-on: #15
This commit is contained in:
ysCha 2025-04-23 16:05:07 +09:00
commit 716c183e40
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java
View File

@ -25,4 +25,6 @@ public class UserResponse {
private String storeLvl; // Store Level
private String groupId; // groupId
private String custCd; // custCd
//시공사 번호
private String builderNo;
}

6
src/main/java/com/interplug/qcast/biz/mainPage/MainPageController.java
View File

@ -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<ObjectResponse> objectList = objectService.selectObjectMainList(objectRequest);
mainPageResponse.setObjectList(objectList);

3
src/main/java/com/interplug/qcast/biz/object/dto/ObjectRequest.java
View File

@ -170,4 +170,7 @@ public class ObjectRequest {
@Schema(description = "종료 Row")
private String endRow;
@Schema(description = "시공사 번호")
private String builderNo;
}

6
src/main/resources/mappers/object/objectMapper.xml
View File

@ -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
<if test='builderNo != null and builderNo != ""'>
AND OI.CREATE_USER = #{userId}
</if>
INNER JOIN M_SALES_STORE S WITH (NOLOCK)
ON O.SALE_STORE_ID = S.SALE_STORE_ID
<if test='saleStoreId != null and saleStoreId != "T01"'>
@ -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
<if test='builderNo != null and builderNo != ""'>
AND OI.CREATE_USER = #{userId}
</if>
INNER JOIN M_SALES_STORE S WITH (NOLOCK)
ON O.SALE_STORE_ID = S.SALE_STORE_ID
<if test='(saleStoreId != null and saleStoreId != "T01") or (schSelSaleStoreId != null and schSelSaleStoreId != "")'>