diff --git a/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/vo/BOPurchsEvtVO.java b/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/vo/BOPurchsEvtVO.java index de96ad94..b1da5d1d 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/vo/BOPurchsEvtVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/vo/BOPurchsEvtVO.java @@ -216,4 +216,6 @@ public class BOPurchsEvtVO extends AbstractVO { private List evtList; /*이벤트 배너 순위*/ private int evtBannerSortOrdr; + private String srchDatePick; + private String srchStr; } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/stats/sleAnals/service/BOSleAnalsService.java b/src/main/java/com/wb/domainserver/domain/gcone/stats/sleAnals/service/BOSleAnalsService.java index 3f2f7fbe..426184e9 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/stats/sleAnals/service/BOSleAnalsService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/stats/sleAnals/service/BOSleAnalsService.java @@ -54,13 +54,13 @@ public class BOSleAnalsService { List resultList = new ArrayList(); List tempList = null; - if("day".equals(vo.get("unitFlag").toString()) ) { // 일별 + if("day".equals(String.valueOf(vo.get("unitFlag"))) ) { // 일별 tempList = sleAnalMapper.selectBODailyChartOrdrAmtRefundAmtInqire(vo); - }else if("week".equals(vo.get("unitFlag").toString()) ) { // 주별 + }else if("week".equals(String.valueOf(vo.get("unitFlag"))) ) { // 주별 tempList = sleAnalMapper.selectBOWeeklyChartOrdrAmtRefundAmtInqire2(vo); - }else if("month".equals(vo.get("unitFlag").toString()) ) { // 월별 + }else if("month".equals(String.valueOf(vo.get("unitFlag"))) ) { // 월별 tempList = sleAnalMapper.selectBOMonthlyChartOrdrAmtRefundAmtInqire(vo); } diff --git a/src/main/java/com/wb/domainserver/domain/mngr/stats/sleAnals/controller/SleAnalsController.java b/src/main/java/com/wb/domainserver/domain/mngr/stats/sleAnals/controller/SleAnalsController.java index b8da27a0..8fd1fac2 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/stats/sleAnals/controller/SleAnalsController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/stats/sleAnals/controller/SleAnalsController.java @@ -1,5 +1,6 @@ package com.wb.domainserver.domain.mngr.stats.sleAnals.controller; +import com.fasterxml.jackson.databind.ObjectMapper; import com.wb.domainserver.common.mvc.tags.ui.pagination.PaginationInfo; import com.wb.domainserver.common.prop.PaginationProperties; import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService; @@ -28,6 +29,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -96,16 +98,20 @@ public class SleAnalsController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/selectMngrSleRsltChart1Inqire", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity selectMngrSleRsltChart1Inqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, DataMap vo) { - vo.put("sopmalCd", authSopmalCd); + public ResponseEntity selectMngrSleRsltChart1Inqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, SleAnalsVO vo) { + vo.setSopmalCd(authSopmalCd); + + ObjectMapper objectMapper = new ObjectMapper(); + DataMap param = objectMapper.convertValue(vo, DataMap.class); AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ - vo.put("sopmalCd", user.getSopmalCd()); + param.put("sopmalCd", user.getSopmalCd()); } + // 응답 메세지 객체 - Map content = service.selectBOMngrSleRsltChart1Inqire(vo); + Map content = service.selectBOMngrSleRsltChart1Inqire(param); return ResponseEntity.ok( WnbtResponse.builder() @@ -124,16 +130,20 @@ public class SleAnalsController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/selectMngrSleRsltChart2Inqire", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity selectMngrSleRsltChart2Inqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, DataMap vo) { - vo.put("sopmalCd", authSopmalCd); + public ResponseEntity selectMngrSleRsltChart2Inqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, SleAnalsVO vo) { + vo.setSopmalCd(authSopmalCd); + + ObjectMapper objectMapper = new ObjectMapper(); + DataMap param = objectMapper.convertValue(vo, DataMap.class); AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ - vo.put("sopmalCd", user.getSopmalCd()); + param.put("sopmalCd", user.getSopmalCd()); } + // 응답 메세지 객체 - List content = service.selectBOMngrSleRsltChart2Inqire(vo); + List content = service.selectBOMngrSleRsltChart2Inqire(param); return ResponseEntity.ok( WnbtResponse.builder() .resBody(new WnbtResponseBody(content)) @@ -358,16 +368,19 @@ public class SleAnalsController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/selectMngrGoodsRsltChartInqire", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity selectMngrGoodsRsltChartInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, DataMap vo) { - vo.put("sopmalCd", authSopmalCd); + public ResponseEntity selectMngrGoodsRsltChartInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, SleAnalsVO vo) { + vo.setSopmalCd(authSopmalCd); + + ObjectMapper objectMapper = new ObjectMapper(); + DataMap param = objectMapper.convertValue(vo, DataMap.class); AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ - vo.put("sopmalCd", user.getSopmalCd()); + param.put("sopmalCd", user.getSopmalCd()); } // 응답 메세지 객체 - Map content = service.selectBOMngrGoodsRsltChartInqire(vo); + Map content = service.selectBOMngrGoodsRsltChartInqire(param); return ResponseEntity.ok( WnbtResponse.builder() @@ -772,16 +785,19 @@ public class SleAnalsController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/selectMngrGoodsPopulationStatsChartInqire", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity selectMngrGoodsPopulationStatsChartInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, DataMap vo) { - vo.put("sopmalCd", authSopmalCd); + public ResponseEntity selectMngrGoodsPopulationStatsChartInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, SleAnalsVO vo) { + vo.setSopmalCd(authSopmalCd); + + ObjectMapper objectMapper = new ObjectMapper(); + DataMap param = objectMapper.convertValue(vo, DataMap.class); AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ - vo.put("sopmalCd", user.getSopmalCd()); + param.put("sopmalCd", user.getSopmalCd()); } // 응답 메세지 객체 - Map content = service.selectBOMngrGoodsPopulationStatsChartInqire(vo); + Map content = service.selectBOMngrGoodsPopulationStatsChartInqire(param); return ResponseEntity.ok( WnbtResponse.builder()