Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

src/main/java/com/oqpo/api/service/loanmng/UnpaidMngService.java

@@ -7,6 +7,7 @@ import com.oqpo.api.mapper.loanmng.UnpaidMngMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.loanmng.StlDtlListResponse;
 import com.oqpo.api.web.dto.response.loanmng.UnpaidMngInfoResponse;
 import com.oqpo.api.web.dto.response.loanmng.UnpaidMngListResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -55,8 +56,62 @@ public class UnpaidMngService extends CommonService {
     /* 미납금관리 정보 조회 */
     public UnpaidMngInfoResponse selectUnpaidMngInfo(String sttlMgntUnqNo) throws Exception {
         StlMgntBaseInfoEntity entity = unpaidMngMapper.selectStlMgntBaseInfo(sttlMgntUnqNo);
-        List<StlMgntDtlPtclEntity> dtlPtclEntities = unpaidMngMapper.selectStlMgntDtlPtclList(sttlMgntUnqNo);
-        return UnpaidMngInfoResponse.toDTO(entity, dtlPtclEntities);
+        return UnpaidMngInfoResponse.toDTO(entity);
+    }
+
+    /*
+      정산대상내역 그리드 리스트 조회
+     */
+    public GridResponse selectStlDtlGridList(String sttlMgntUnqNo, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        List<StlMgntDtlPtclEntity> entities = unpaidMngMapper.selectStlMgntDtlPtclList(sttlMgntUnqNo);
+        int gridRecords = entities.size();
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<Object> gridRows = entities.stream()
+                .map(m -> StlDtlListResponse.builder()
+                        .viewCd("R")
+                        .sttlMgntUnqNo(m.getSttlMgntUnqNo())
+                        .sttlMgntDtlNo(m.getSttlMgntDtlNo())
+                        .brandId(m.getBrandId())
+                        .brandNm(m.getBrandNm())
+                        .whsMgntUnqNo(m.getWhsMgntUnqNo())
+                        .rtnMgntUnqNo(m.getRtnMgntUnqNo())
+                        .storeId(m.getStoreId())
+                        .storeNm(m.getStoreNm())
+                        .itemId(m.getItemId())
+                        .itemNm(m.getItemNm())
+                        .unit(m.getUnit())
+                        .unitAmt(m.getUnitAmt())
+                        .podrQty(m.getPodrQty())
+                        .dlvQty(m.getDlvQty())
+                        .whsQty(m.getWhsQty())
+                        .colQty(m.getColQty())
+                        .whsColQty(m.getWhsColQty())        /* 입고/수거수량 */
+                        .dlvCmpltDt(m.getDlvCmpltDt())
+                        .colDt(m.getColDt())
+                        .whsColDt(m.getWhsColDt())          /* 입고/수거일자 */
+                        .whsAmt(m.getWhsAmt())
+                        .colAmt(m.getColAmt())
+                        .whsColAmt(m.getWhsColAmt())        /* 입고/수거금액 */
+                        .sttlDvsn(m.getSttlDvsn())
+                        .sttlDvsnNm(m.getSttlDvsnNm())
+                        .pchPodrUnqNo(m.getPchPodrUnqNo())
+                        .pchPodrDtlNo(m.getPchPodrDtlNo())
+                        .pchReqUnqNo(m.getPchReqUnqNo())
+                        .pchReqDtlNo(m.getPchReqDtlNo())
+                        .rtnPodrUnqNo(m.getRtnPodrUnqNo())
+                        .rtnPodrDtlNo(m.getRtnPodrDtlNo())
+                        .rtnReqUnqNo(m.getRtnReqUnqNo())
+                        .rtnReqDtlNo(m.getRtnReqDtlNo())
+                        .sysRegDttm(m.getSysRegDttm())
+                        .sysRegId(m.getSysRegId())
+                        .sysChgDttm(m.getSysChgDttm())
+                        .sysChgId(m.getSysChgId())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
 }

src/main/java/com/oqpo/api/web/controller/loanmng/UnpaidMngController.java

@@ -58,4 +58,20 @@ public class UnpaidMngController {
         return ResponseEntity.ok(unpaidMngService.selectUnpaidMngInfo(sttlMgntUnqNo));
     }
 
+    /**
+     * 설명 : 정산대상내역 그리드 리스트
+     *
+     * @param stlDtlGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "정산대상내역 그리드 리스트")
+    @PostMapping("/stl-grid-list")
+    public ResponseEntity<GridResponse> stlGridList(@RequestBody @Valid StlDtlGridRequest stlDtlGridRequest) throws Exception {
+        return ResponseEntity.ok(unpaidMngService.selectStlDtlGridList(stlDtlGridRequest.getSttlMgntUnqNo(), stlDtlGridRequest.toDTO(stlDtlGridRequest)));
+    }
+
 }

src/main/java/com/oqpo/api/web/dto/request/loanmng/StlDtlGridRequest.java

@@ -0,0 +1,19 @@
+package com.oqpo.api.web.dto.request.loanmng;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class StlDtlGridRequest extends GridRequest {
+
+    @ApiModelProperty(value = "정산관리고유번호")
+    String sttlMgntUnqNo;
+
+    protected StlDtlGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/loanmng/StlDtlListResponse.java

@@ -0,0 +1,104 @@
+package com.oqpo.api.web.dto.response.loanmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class StlDtlListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "정산관리고유번호")
+    private String sttlMgntUnqNo;
+    @ApiModelProperty(value = "정산관리상세번호")
+    private String sttlMgntDtlNo;
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+    @ApiModelProperty(value = "입고관리고유번호")
+    private String whsMgntUnqNo;
+    @ApiModelProperty(value = "반품관리고유번호")
+    private String rtnMgntUnqNo;
+    @ApiModelProperty(value = "매장아이디")
+    private String storeId;
+    @ApiModelProperty(value = "매장명")
+    private String storeNm;
+    @ApiModelProperty(value = "품목아이디")
+    private String itemId;
+    @ApiModelProperty(value = "품목명")
+    private String itemNm;
+    @ApiModelProperty(value = "단위")
+    private String unit;
+    @ApiModelProperty(value = "단가금액")
+    private long unitAmt;
+    @ApiModelProperty(value = "발주수량")
+    private int podrQty;
+    @ApiModelProperty(value = "납품수량")
+    private int dlvQty;
+
+    @ApiModelProperty(value = "입고수량")
+    private int whsQty;
+    @ApiModelProperty(value = "수거수량")
+    private int colQty;
+    @ApiModelProperty(value = "입고/수거수량")
+    private int whsColQty;
+
+    @ApiModelProperty(value = "납품완료일자")
+    private String dlvCmpltDt;
+    @ApiModelProperty(value = "수거일자")
+    private String colDt;
+    @ApiModelProperty(value = "입고/수거일자")
+    private String whsColDt;
+
+    @ApiModelProperty(value = "입고금액")
+    private long whsAmt;
+    @ApiModelProperty(value = "수거금액")
+    private long colAmt;
+    @ApiModelProperty(value = "입고/수거금액")
+    private long whsColAmt;
+
+    @ApiModelProperty(value = "정산요청금액")
+    private long sttlReqAmt;
+
+    @ApiModelProperty(value = "정산구분")
+    private String sttlDvsn;
+    @ApiModelProperty(value = "정산구분명")
+    private String sttlDvsnNm;
+    @ApiModelProperty(value = "구매발주고유번호")
+    private String pchPodrUnqNo;
+    @ApiModelProperty(value = "구매발주상세번호")
+    private String pchPodrDtlNo;
+    @ApiModelProperty(value = "구매요청고유번호")
+    private String pchReqUnqNo;
+    @ApiModelProperty(value = "구매요청상세번호")
+    private String pchReqDtlNo;
+    @ApiModelProperty(value = "반품발주고유번호")
+    private String rtnPodrUnqNo;
+    @ApiModelProperty(value = "반품발주상세번호")
+    private String rtnPodrDtlNo;
+    @ApiModelProperty(value = "반품요청고유번호")
+    private String rtnReqUnqNo;
+    @ApiModelProperty(value = "반품요청상세번호")
+    private String rtnReqDtlNo;
+    @ApiModelProperty(value = "시스템등록일시")
+    private String sysRegDttm;
+    @ApiModelProperty(value = "시스템등록아이디")
+    private String sysRegId;
+    @ApiModelProperty(value = "시스템변경일시")
+    private String sysChgDttm;
+    @ApiModelProperty(value = "시스템변경아이디")
+    private String sysChgId;
+
+    @ApiModelProperty(value = "발주고유번호")
+    private String podrUnqNo;
+    @ApiModelProperty(value = "발주상세번호")
+    private String podrDtlNo;
+
+}

src/main/java/com/oqpo/api/web/dto/response/loanmng/UnpaidMngInfoResponse.java

@@ -57,10 +57,7 @@ public class UnpaidMngInfoResponse {
     @ApiModelProperty(value = "계좌잔액")
     private long acctBal;
 
-    @ApiModelProperty(value = "정산대상내역")
-    private List<StlDtlPtclInfo> stlDtlPtclList;
-
-    public static UnpaidMngInfoResponse toDTO(StlMgntBaseInfoEntity entity, List<StlMgntDtlPtclEntity> dtlPtclEntities) {
+    public static UnpaidMngInfoResponse toDTO(StlMgntBaseInfoEntity entity) {
         if (entity == null) return null;
         return UnpaidMngInfoResponse.builder()
                 .sttlMgntUnqNo(entity.getSttlMgntUnqNo())
@@ -80,142 +77,7 @@ public class UnpaidMngInfoResponse {
                 .sysRegId(entity.getSysRegId())
                 .sysChgDttm(entity.getSysChgDttm())
                 .sysChgId(entity.getSysChgId())
-                .stlDtlPtclList(dtlPtclEntities.stream()
-                        .map(m -> StlDtlPtclInfo.builder()
-                                .sttlMgntUnqNo(m.getSttlMgntUnqNo())
-                                .sttlMgntDtlNo(m.getSttlMgntDtlNo())
-                                .brandId(m.getBrandId())
-                                .brandNm(m.getBrandNm())
-                                .whsMgntUnqNo(m.getWhsMgntUnqNo())
-                                .rtnMgntUnqNo(m.getRtnMgntUnqNo())
-                                .storeId(m.getStoreId())
-                                .storeNm(m.getStoreNm())
-                                .itemId(m.getItemId())
-                                .itemNm(m.getItemNm())
-                                .unit(m.getUnit())
-                                .unitAmt(m.getUnitAmt())
-                                .podrQty(m.getPodrQty())
-                                .dlvQty(m.getDlvQty())
-                                .whsQty(m.getWhsQty())
-                                .colQty(m.getColQty())
-                                .whsColQty(m.getWhsColQty())        /* 입고/수거수량 */
-                                .dlvCmpltDt(m.getDlvCmpltDt())
-                                .colDt(m.getColDt())
-                                .whsColDt(m.getWhsColDt())          /* 입고/수거일자 */
-                                .whsAmt(m.getWhsAmt())
-                                .colAmt(m.getColAmt())
-                                .whsColAmt(m.getWhsColAmt())        /* 입고/수거금액 */
-                                .sttlDvsn(m.getSttlDvsn())
-                                .sttlDvsnNm(m.getSttlDvsnNm())
-                                .pchPodrUnqNo(m.getPchPodrUnqNo())
-                                .pchPodrDtlNo(m.getPchPodrDtlNo())
-                                .pchReqUnqNo(m.getPchReqUnqNo())
-                                .pchReqDtlNo(m.getPchReqDtlNo())
-                                .rtnPodrUnqNo(m.getRtnPodrUnqNo())
-                                .rtnPodrDtlNo(m.getRtnPodrDtlNo())
-                                .rtnReqUnqNo(m.getRtnReqUnqNo())
-                                .rtnReqDtlNo(m.getRtnReqDtlNo())
-                                .sysRegDttm(m.getSysRegDttm())
-                                .sysRegId(m.getSysRegId())
-                                .sysChgDttm(m.getSysChgDttm())
-                                .sysChgId(m.getSysChgId())
-                                .build())
-                        .collect(Collectors.toList()))
                 .build();
     }
 
-    @Getter
-    @Builder
-    @AllArgsConstructor(access = AccessLevel.PROTECTED)
-    static class StlDtlPtclInfo {
-
-        @ApiModelProperty(value = "정산관리고유번호")
-        private String sttlMgntUnqNo;
-        @ApiModelProperty(value = "정산관리상세번호")
-        private String sttlMgntDtlNo;
-        @ApiModelProperty(value = "브랜드아이디")
-        private String brandId;
-        @ApiModelProperty(value = "브랜드명")
-        private String brandNm;
-        @ApiModelProperty(value = "입고관리고유번호")
-        private String whsMgntUnqNo;
-        @ApiModelProperty(value = "반품관리고유번호")
-        private String rtnMgntUnqNo;
-        @ApiModelProperty(value = "매장아이디")
-        private String storeId;
-        @ApiModelProperty(value = "매장명")
-        private String storeNm;
-        @ApiModelProperty(value = "품목아이디")
-        private String itemId;
-        @ApiModelProperty(value = "품목명")
-        private String itemNm;
-        @ApiModelProperty(value = "단위")
-        private String unit;
-        @ApiModelProperty(value = "단가금액")
-        private long unitAmt;
-        @ApiModelProperty(value = "발주수량")
-        private int podrQty;
-        @ApiModelProperty(value = "납품수량")
-        private int dlvQty;
-
-        @ApiModelProperty(value = "입고수량")
-        private int whsQty;
-        @ApiModelProperty(value = "수거수량")
-        private int colQty;
-        @ApiModelProperty(value = "입고/수거수량")
-        private int whsColQty;
-
-        @ApiModelProperty(value = "납품완료일자")
-        private String dlvCmpltDt;
-        @ApiModelProperty(value = "수거일자")
-        private String colDt;
-        @ApiModelProperty(value = "입고/수거일자")
-        private String whsColDt;
-
-        @ApiModelProperty(value = "입고금액")
-        private long whsAmt;
-        @ApiModelProperty(value = "수거금액")
-        private long colAmt;
-        @ApiModelProperty(value = "입고/수거금액")
-        private long whsColAmt;
-
-        @ApiModelProperty(value = "정산요청금액")
-        private long sttlReqAmt;
-
-        @ApiModelProperty(value = "정산구분")
-        private String sttlDvsn;
-        @ApiModelProperty(value = "정산구분명")
-        private String sttlDvsnNm;
-        @ApiModelProperty(value = "구매발주고유번호")
-        private String pchPodrUnqNo;
-        @ApiModelProperty(value = "구매발주상세번호")
-        private String pchPodrDtlNo;
-        @ApiModelProperty(value = "구매요청고유번호")
-        private String pchReqUnqNo;
-        @ApiModelProperty(value = "구매요청상세번호")
-        private String pchReqDtlNo;
-        @ApiModelProperty(value = "반품발주고유번호")
-        private String rtnPodrUnqNo;
-        @ApiModelProperty(value = "반품발주상세번호")
-        private String rtnPodrDtlNo;
-        @ApiModelProperty(value = "반품요청고유번호")
-        private String rtnReqUnqNo;
-        @ApiModelProperty(value = "반품요청상세번호")
-        private String rtnReqDtlNo;
-        @ApiModelProperty(value = "시스템등록일시")
-        private String sysRegDttm;
-        @ApiModelProperty(value = "시스템등록아이디")
-        private String sysRegId;
-        @ApiModelProperty(value = "시스템변경일시")
-        private String sysChgDttm;
-        @ApiModelProperty(value = "시스템변경아이디")
-        private String sysChgId;
-
-        @ApiModelProperty(value = "발주고유번호")
-        private String podrUnqNo;
-        @ApiModelProperty(value = "발주상세번호")
-        private String podrDtlNo;
-
-    }
-
 }