메인화면 차트

src/main/java/com/oqpo/api/mapper/oper/MainChartMapper.java

@@ -23,7 +23,7 @@ public interface MainChartMapper {
 
     List<MainChartEntity> selectPrRankChart(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("prType") String prType) throws Exception;
 
-    MainChartEntity selectStlChart(@Param("brandId") String brandId, @Param("storeId") String storeId) throws Exception;
+    MainChartEntity selectStlChart(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("spplyId") String spplyId) throws Exception;
 
     List<MainChartEntity> selectSftStckChart(@Param("brandId") String brandId, @Param("storeId") String storeId) throws Exception;
 

src/main/java/com/oqpo/api/service/oper/MainChartService.java

@@ -93,9 +93,15 @@ public class MainChartService extends CommonService {
         return result;
     }
 
-    public ChartResponse selectStlChart(String brandId, String storeId) throws Exception {
-        MainChartEntity entity = mainChartMapper.selectStlChart(brandId, storeId);
-
+    public ChartResponse selectStlChart(String brandId, String storeId, String spplyId) throws Exception {
+        MainChartEntity entity = null;
+        if (!StringUtil.isEmpty(spplyId)) {
+            entity = mainChartMapper.selectStlChart(null, null, spplyId);
+        } else if (!StringUtil.isEmpty(storeId)) {
+            entity = mainChartMapper.selectStlChart(null, storeId, null);
+        } else if (!StringUtil.isEmpty(brandId)) {
+            entity = mainChartMapper.selectStlChart(brandId, null, null);
+        }
         // String chartData = "[ [' ', '요청', '확인', '반려'], [' ', " + entity.getSt10Val() + " , " + entity.getSt20Val() + " , " + entity.getSt30Val() + "] ]";
         String chartData = "[ [' ', ' '], ['요청', " + entity.getSt10Val() + "], ['확인', " + entity.getSt20Val() + "], ['반려', " + entity.getSt30Val() + "] ]";
 

src/main/java/com/oqpo/api/web/controller/oper/MainChartController.java

@@ -116,13 +116,14 @@ public class MainChartController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
             @ApiImplicitParam(name = "brandId", value = "브랜드아이디", required = true, dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "storeId", value = "매장아이디", required = true, dataType = "String", paramType = "query")
+            @ApiImplicitParam(name = "storeId", value = "매장아이디", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "spplyId", value = "공급사아이디", required = true, dataType = "String", paramType = "query")
     })
     @ApiOperation(value = "정산 차트")
     @GetMapping("/stl-chart")
-    public ResponseEntity<ChartResponse> stl_chart(@RequestParam(value = "brandId") String brandId,
-                                                   @RequestParam(value = "storeId") String storeId) throws Exception {
-        return ResponseEntity.ok(mainChartService.selectStlChart(brandId, storeId));
+    public ResponseEntity<ChartResponse> stl_chart(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "storeId") String storeId,
+                                                   @RequestParam(value = "spplyId") String spplyId) throws Exception {
+        return ResponseEntity.ok(mainChartService.selectStlChart(brandId, storeId, spplyId));
     }
 
     /**

src/main/resources/mybatis/sqlmaps/oper/MainChart.xml

@@ -150,14 +150,20 @@
             COUNT(CASE WHEN A.sttl_st_cd = 'ST20' THEN A.sttl_mgnt_unq_no END) AS st20_val,
             COUNT(CASE WHEN A.sttl_st_cd = 'ST30' THEN A.sttl_mgnt_unq_no END) AS st30_val
         FROM stl_mgnt_base_info A
-        WHERE A.sttl_target_cd = 'S0'
+        WHERE 1 = 1
         <if test="brandId != null and brandId != '' ">
             AND A.brand_id = #{brandId}
+            AND A.sttl_target_cd = 'S0'     /* 매장정산 */
         </if>
         <if test="storeId != null and storeId != '' ">
             AND A.store_id = #{storeId}
+            AND A.sttl_target_cd = 'S0'     /* 매장정산 */
+        </if>
+        <if test="spplyId != null and spplyId != '' ">
+            AND A.spply_id = #{spplyId}
+            AND A.sttl_target_cd = 'S1'     /* 공급사정산 */
         </if>
-        AND A.SYS_CHG_DTTM >= DATE(NOW())           /* 당일기준 - 수정일시로 비교 */
+        /* AND A.SYS_CHG_DTTM >= DATE(NOW()) */
     </select>
 
     <select id="selectPrRankChart" resultType="com.oqpo.api.entity.oper.MainChartEntity">