|
|
@@ -7,6 +7,7 @@ import java.util.Collection;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
+import com.style24.persistence.TscPageRequest;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.core.env.Environment;
|
|
|
import org.springframework.core.io.InputStreamResource;
|
|
|
@@ -31,7 +32,6 @@ import com.style24.admin.biz.service.TsaSystemService;
|
|
|
import com.style24.admin.support.controller.TsaBaseController;
|
|
|
import com.style24.admin.support.security.session.TsaSession;
|
|
|
import com.style24.core.support.message.TscMessageByLocale;
|
|
|
-import com.style24.persistence.TsaPageRequest;
|
|
|
import com.style24.persistence.domain.AdKeyword;
|
|
|
import com.style24.persistence.domain.AdKeywordGoods;
|
|
|
import com.style24.persistence.domain.Color;
|
|
|
@@ -509,7 +509,7 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
}
|
|
|
log.info("[getGoodsList] goodsSearch=>{}", goodsSearch);
|
|
|
goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
|
|
|
- goodsSearch.setPageable(new TsaPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
+ goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
goodsSearch.getPageable().setTotalCount(goodsService.getGoodsListCount(goodsSearch));
|
|
|
|
|
|
result.set("pageing", goodsSearch);
|
|
|
@@ -1275,7 +1275,7 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
|
|
|
GagaMap result = new GagaMap();
|
|
|
|
|
|
- wmsGoods.setPageable(new TsaPageRequest(wmsGoods.getPageNo() - 1, wmsGoods.getPageSize()));
|
|
|
+ wmsGoods.setPageable(new TscPageRequest(wmsGoods.getPageNo() - 1, wmsGoods.getPageSize()));
|
|
|
wmsGoods.getPageable().setTotalCount(goodsService.getGoodsWmsIncomelotListCount(wmsGoods));
|
|
|
|
|
|
result.set("pageing", wmsGoods);
|
|
|
@@ -1482,7 +1482,7 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
}
|
|
|
|
|
|
goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
|
|
|
- goodsSearch.setPageable(new TsaPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
+ goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
goodsSearch.getPageable().setTotalCount(goodsService.getGoodsTitleReserveCount(goodsSearch));
|
|
|
|
|
|
result.set("pageing", goodsSearch);
|
|
|
@@ -1683,7 +1683,7 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
}
|
|
|
|
|
|
goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
|
|
|
- goodsSearch.setPageable(new TsaPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
+ goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
goodsSearch.getPageable().setTotalCount(goodsService.getGoodsEpSkipCount(goodsSearch));
|
|
|
|
|
|
result.set("pageing", goodsSearch);
|
|
|
@@ -1776,7 +1776,7 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
|
|
|
GagaMap result = new GagaMap();
|
|
|
|
|
|
- goodsSearch.setPageable(new TsaPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
+ goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
goodsSearch.getPageable().setTotalCount(goodsService.getReinboundInformCount(goodsSearch));
|
|
|
|
|
|
result.set("pageing", goodsSearch);
|
|
|
@@ -1857,7 +1857,7 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
}
|
|
|
|
|
|
goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
|
|
|
- goodsSearch.setPageable(new TsaPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
+ goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
goodsSearch.getPageable().setTotalCount(goodsService.getGoodsResSellCount(goodsSearch));
|
|
|
|
|
|
result.set("pageing", goodsSearch);
|
|
|
@@ -2084,7 +2084,7 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
}
|
|
|
log.info("[getPopupGoodsList] goodsSearch=>{}", goodsSearch);
|
|
|
goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
|
|
|
- goodsSearch.setPageable(new TsaPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
+ goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
goodsSearch.getPageable().setTotalCount(goodsService.getGoodsListCount(goodsSearch));
|
|
|
|
|
|
result.set("pageing", goodsSearch);
|
|
|
@@ -2150,7 +2150,7 @@ public class TsaGoodsController extends TsaBaseController {
|
|
|
}
|
|
|
|
|
|
goodsSearch.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
|
|
|
- goodsSearch.setPageable(new TsaPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
+ goodsSearch.setPageable(new TscPageRequest(goodsSearch.getPageNo() - 1, goodsSearch.getPageSize()));
|
|
|
goodsSearch.getPageable().setTotalCount(goodsService.getGoodsPriceResCount(goodsSearch));
|
|
|
|
|
|
result.set("pageing", goodsSearch);
|