Commit 3ae98c6f by 墨竹

feat:确认分页接口

parent dcb9fa4a
...@@ -6,12 +6,16 @@ import com.gic.enterprise.api.dto.StoreSearchDTO; ...@@ -6,12 +6,16 @@ import com.gic.enterprise.api.dto.StoreSearchDTO;
import com.gic.enterprise.api.service.StoreService; import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.base.api.common.PageResult; import com.gic.haoban.base.api.common.PageResult;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode; import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@RestController @RestController
...@@ -19,9 +23,19 @@ import java.util.List; ...@@ -19,9 +23,19 @@ import java.util.List;
public class StoreController extends WebBaseController{ public class StoreController extends WebBaseController{
@Autowired @Autowired
private StoreService storeService; private StoreService storeService;
@Autowired
private StaffApiService staffApiService;
//门店列表 //门店列表
@RequestMapping("/find-simple-page") @RequestMapping("/find-simple-page")
public HaobanResponse storeList(Integer storeType,String enterpriseId,BasePageInfo basePageInfo) { public HaobanResponse storeList(Integer storeType,String enterpriseId,BasePageInfo basePageInfo) {
List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId());
PageResult<StoreDTO> pageVo = new PageResult<>();
if (CollectionUtils.isEmpty(storeRolesByClerkId)) {
return resultResponse(HaoBanErrCode.ERR_1,pageVo);
}
// TODO: 2022/5/19 确认一下到底是用分页还是不分页
//storeService.getStores(storeRolesByClerkId.toArray(new String[storeRolesByClerkId.size()]));
Page page = new Page<>(); Page page = new Page<>();
page.setCurrentPage(basePageInfo.getPageNum()); page.setCurrentPage(basePageInfo.getPageNum());
page.setPageSize(basePageInfo.getPageSize()); page.setPageSize(basePageInfo.getPageSize());
...@@ -30,13 +44,21 @@ public class StoreController extends WebBaseController{ ...@@ -30,13 +44,21 @@ public class StoreController extends WebBaseController{
storeSearchDTO.setStatus("2"); storeSearchDTO.setStatus("2");
storeSearchDTO.setStoreType(storeType); storeSearchDTO.setStoreType(storeType);
Page<StoreDTO> resultPage = storeService.storeListPage(page, storeSearchDTO); Page<StoreDTO> resultPage = storeService.storeListPage(page, storeSearchDTO);
List<StoreDTO> resultList = resultPage.getResult(); List<StoreDTO> storeDTOList = resultPage.getResult();
PageResult<StoreDTO> pageVo = new PageResult<>(); List<StoreDTO> storeDTOs = new ArrayList<>();
pageVo.setList(resultList); for (String s : storeRolesByClerkId) {
for (StoreDTO storeDTO : storeDTOList) {
String storeId = storeDTO.getStoreId();
if (s.equals(storeId)) {
storeDTOs.add(storeDTO);
}
}
}
pageVo.setList(storeDTOs);
pageVo.setPageNum(page.getCurrentPage()); pageVo.setPageNum(page.getCurrentPage());
pageVo.setPages(resultPage.getPages()); pageVo.setPages(resultPage.getPages());
pageVo.setPageSize(page.getPageSize()); pageVo.setPageSize(page.getPageSize());
pageVo.setTotal(resultPage.getTotalCount()); pageVo.setTotal(storeDTOs.size());
return resultResponse(HaoBanErrCode.ERR_1,pageVo); return resultResponse(HaoBanErrCode.ERR_1,pageVo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment