986 - 시공사번호 추가, 시공사(userId) 데이터만 조회 #15
@ -25,4 +25,6 @@ public class UserResponse {
|
|||||||
private String storeLvl; // Store Level
|
private String storeLvl; // Store Level
|
||||||
private String groupId; // groupId
|
private String groupId; // groupId
|
||||||
private String custCd; // custCd
|
private String custCd; // custCd
|
||||||
|
//시공사 번호
|
||||||
|
private String builderNo;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,9 +21,9 @@ public class MainPageController {
|
|||||||
private final ObjectService objectService;
|
private final ObjectService objectService;
|
||||||
|
|
||||||
@Operation(description = "메인 물건정보 목록을 조회한다.")
|
@Operation(description = "메인 물건정보 목록을 조회한다.")
|
||||||
@GetMapping("/object/{saleStoreId}/list")
|
@GetMapping("/object/{saleStoreId}/{userId}/{builderNo}/list")
|
||||||
@ResponseStatus(HttpStatus.OK)
|
@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();
|
MainPageResponse mainPageResponse = new MainPageResponse();
|
||||||
|
|
||||||
// 판매점명 조회
|
// 판매점명 조회
|
||||||
@ -39,6 +39,8 @@ public class MainPageController {
|
|||||||
// 물건정보 목록 조회
|
// 물건정보 목록 조회
|
||||||
ObjectRequest objectRequest = new ObjectRequest();
|
ObjectRequest objectRequest = new ObjectRequest();
|
||||||
objectRequest.setSaleStoreId(saleStoreId);
|
objectRequest.setSaleStoreId(saleStoreId);
|
||||||
|
objectRequest.setUserId(userId);
|
||||||
|
objectRequest.setBuilderNo(builderNo);
|
||||||
|
|
||||||
List<ObjectResponse> objectList = objectService.selectObjectMainList(objectRequest);
|
List<ObjectResponse> objectList = objectService.selectObjectMainList(objectRequest);
|
||||||
mainPageResponse.setObjectList(objectList);
|
mainPageResponse.setObjectList(objectList);
|
||||||
|
|||||||
@ -170,4 +170,7 @@ public class ObjectRequest {
|
|||||||
|
|
||||||
@Schema(description = "종료 Row")
|
@Schema(description = "종료 Row")
|
||||||
private String endRow;
|
private String endRow;
|
||||||
|
|
||||||
|
@Schema(description = "시공사 번호")
|
||||||
|
private String builderNo;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -183,6 +183,9 @@
|
|||||||
FROM T_OBJECT O WITH (NOLOCK)
|
FROM T_OBJECT O WITH (NOLOCK)
|
||||||
INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
|
INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
|
||||||
ON O.OBJECT_NO = OI.OBJECT_NO
|
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)
|
INNER JOIN M_SALES_STORE S WITH (NOLOCK)
|
||||||
ON O.SALE_STORE_ID = S.SALE_STORE_ID
|
ON O.SALE_STORE_ID = S.SALE_STORE_ID
|
||||||
<if test='saleStoreId != null and saleStoreId != "T01"'>
|
<if test='saleStoreId != null and saleStoreId != "T01"'>
|
||||||
@ -274,6 +277,9 @@
|
|||||||
FROM T_OBJECT O WITH (NOLOCK)
|
FROM T_OBJECT O WITH (NOLOCK)
|
||||||
INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
|
INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
|
||||||
ON O.OBJECT_NO = OI.OBJECT_NO
|
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)
|
INNER JOIN M_SALES_STORE S WITH (NOLOCK)
|
||||||
ON O.SALE_STORE_ID = S.SALE_STORE_ID
|
ON O.SALE_STORE_ID = S.SALE_STORE_ID
|
||||||
<if test='(saleStoreId != null and saleStoreId != "T01") or (schSelSaleStoreId != null and schSelSaleStoreId != "")'>
|
<if test='(saleStoreId != null and saleStoreId != "T01") or (schSelSaleStoreId != null and schSelSaleStoreId != "")'>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user