itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fo bo 머지작업 - 오류수정

Browse Source
This commit is contained in:
jazz
2025-11-28 18:06:52 +09:00
parent 672e97f7ee
commit 99eb2d1e58
3 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/wb/domainserver/domain/gcone/promtn/purchs/vo/BOPurchsEvtVO.java
View File

@@ -216,4 +216,6 @@ public class BOPurchsEvtVO extends AbstractVO {
private List<String> evtList; private List<String> evtList;
/*이벤트 배너 순위*/ /*이벤트 배너 순위*/
private int evtBannerSortOrdr; private int evtBannerSortOrdr;
private String srchDatePick;
private String srchStr;
} }

6
src/main/java/com/wb/domainserver/domain/gcone/stats/sleAnals/service/BOSleAnalsService.java
View File

@@ -54,13 +54,13 @@ public class BOSleAnalsService {
List<DataMap> resultList = new ArrayList<DataMap>(); List<DataMap> resultList = new ArrayList<DataMap>();
List<DataMap> tempList = null; List<DataMap> tempList = null;
if("day".equals(vo.get("unitFlag").toString()) ) { // 일별 if("day".equals(String.valueOf(vo.get("unitFlag"))) ) { // 일별
tempList = sleAnalMapper.selectBODailyChartOrdrAmtRefundAmtInqire(vo); 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); 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); tempList = sleAnalMapper.selectBOMonthlyChartOrdrAmtRefundAmtInqire(vo);
} }

48
src/main/java/com/wb/domainserver/domain/mngr/stats/sleAnals/controller/SleAnalsController.java
View File

@@ -1,5 +1,6 @@
package com.wb.domainserver.domain.mngr.stats.sleAnals.controller; 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.mvc.tags.ui.pagination.PaginationInfo;
import com.wb.domainserver.common.prop.PaginationProperties; import com.wb.domainserver.common.prop.PaginationProperties;
import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService; 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.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.CookieValue; 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.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
@@ -96,16 +98,20 @@ public class SleAnalsController {
*/ */
@Policy(AuthPolicy.RESTRICTED) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectMngrSleRsltChart1Inqire", produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value="/selectMngrSleRsltChart1Inqire", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> selectMngrSleRsltChart1Inqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, DataMap vo) { public ResponseEntity<WnbtResponse> selectMngrSleRsltChart1Inqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, SleAnalsVO vo) {
vo.put("sopmalCd", authSopmalCd); vo.setSopmalCd(authSopmalCd);
ObjectMapper objectMapper = new ObjectMapper();
DataMap param = objectMapper.convertValue(vo, DataMap.class);
AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
if("01".equals(user.getSysDvCd())){ if("01".equals(user.getSysDvCd())){
vo.put("sopmalCd", user.getSopmalCd()); param.put("sopmalCd", user.getSopmalCd());
} }
// 응답 메세지 객체 // 응답 메세지 객체
Map<String, Object> content = service.selectBOMngrSleRsltChart1Inqire(vo); Map<String, Object> content = service.selectBOMngrSleRsltChart1Inqire(param);
return ResponseEntity.ok( return ResponseEntity.ok(
WnbtResponse.builder() WnbtResponse.builder()
@@ -124,16 +130,20 @@ public class SleAnalsController {
*/ */
@Policy(AuthPolicy.RESTRICTED) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectMngrSleRsltChart2Inqire", produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value="/selectMngrSleRsltChart2Inqire", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> selectMngrSleRsltChart2Inqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, DataMap vo) { public ResponseEntity<WnbtResponse> selectMngrSleRsltChart2Inqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, SleAnalsVO vo) {
vo.put("sopmalCd", authSopmalCd); vo.setSopmalCd(authSopmalCd);
ObjectMapper objectMapper = new ObjectMapper();
DataMap param = objectMapper.convertValue(vo, DataMap.class);
AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
if("01".equals(user.getSysDvCd())){ if("01".equals(user.getSysDvCd())){
vo.put("sopmalCd", user.getSopmalCd()); param.put("sopmalCd", user.getSopmalCd());
} }
// 응답 메세지 객체 // 응답 메세지 객체
List<DataMap> content = service.selectBOMngrSleRsltChart2Inqire(vo); List<DataMap> content = service.selectBOMngrSleRsltChart2Inqire(param);
return ResponseEntity.ok( return ResponseEntity.ok(
WnbtResponse.builder() WnbtResponse.builder()
.resBody(new WnbtResponseBody(content)) .resBody(new WnbtResponseBody(content))
@@ -358,16 +368,19 @@ public class SleAnalsController {
*/ */
@Policy(AuthPolicy.RESTRICTED) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectMngrGoodsRsltChartInqire", produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value="/selectMngrGoodsRsltChartInqire", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> selectMngrGoodsRsltChartInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, DataMap vo) { public ResponseEntity<WnbtResponse> selectMngrGoodsRsltChartInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, SleAnalsVO vo) {
vo.put("sopmalCd", authSopmalCd); vo.setSopmalCd(authSopmalCd);
ObjectMapper objectMapper = new ObjectMapper();
DataMap param = objectMapper.convertValue(vo, DataMap.class);
AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
if("01".equals(user.getSysDvCd())){ if("01".equals(user.getSysDvCd())){
vo.put("sopmalCd", user.getSopmalCd()); param.put("sopmalCd", user.getSopmalCd());
} }
// 응답 메세지 객체 // 응답 메세지 객체
Map<String, Object> content = service.selectBOMngrGoodsRsltChartInqire(vo); Map<String, Object> content = service.selectBOMngrGoodsRsltChartInqire(param);
return ResponseEntity.ok( return ResponseEntity.ok(
WnbtResponse.builder() WnbtResponse.builder()
@@ -772,16 +785,19 @@ public class SleAnalsController {
*/ */
@Policy(AuthPolicy.RESTRICTED) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectMngrGoodsPopulationStatsChartInqire", produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value="/selectMngrGoodsPopulationStatsChartInqire", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> selectMngrGoodsPopulationStatsChartInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, DataMap vo) { public ResponseEntity<WnbtResponse> selectMngrGoodsPopulationStatsChartInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, SleAnalsVO vo) {
vo.put("sopmalCd", authSopmalCd); vo.setSopmalCd(authSopmalCd);
ObjectMapper objectMapper = new ObjectMapper();
DataMap param = objectMapper.convertValue(vo, DataMap.class);
AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
if("01".equals(user.getSysDvCd())){ if("01".equals(user.getSysDvCd())){
vo.put("sopmalCd", user.getSopmalCd()); param.put("sopmalCd", user.getSopmalCd());
} }
// 응답 메세지 객체 // 응답 메세지 객체
Map<String, Object> content = service.selectBOMngrGoodsPopulationStatsChartInqire(vo); Map<String, Object> content = service.selectBOMngrGoodsPopulationStatsChartInqire(param);
return ResponseEntity.ok( return ResponseEntity.ok(
WnbtResponse.builder() WnbtResponse.builder()