diff --git a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java index 01172b4..c54ee12 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java @@ -29,11 +29,12 @@ public class StoreEmployeeController extends BaseController { * * @return */ - @RequestMapping(value = "list/excel",method = RequestMethod.POST) + @RequestMapping(value = "list",method = RequestMethod.POST) @ResponseBody - public Map listStoreUser(@RequestParam("storeId")Long storeId, @RequestParam("regionId")Long regionId){ + public Map listStoreUser(@RequestParam("storeId")Long storeId, @RequestParam("regionId")Long regionId, + @RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize){ try { - storeEmployeeService.listStoreUser(storeId,regionId); + storeEmployeeService.listStoreUser(storeId,regionId,pageNum, pageSize); return data(null); }catch (Exception e){ log.error("添加用户失败",e); diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index e791aa5..edc73d4 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -64,9 +64,10 @@ public class StoreEmployeeService { * @param storeId 门店id * @param regionId 区域id */ - public void listStoreUser(Long storeId, Long regionId) { + public void listStoreUser(Long storeId, Long regionId, Integer pageNum, Integer pageSize) { Map result = new HashMap<>(); List poiStores = null; + PageHelper.startPage(pageNum, pageSize); if (storeId != null){ QueryWrapper storeParams = new QueryWrapper<>(); poiStores = poiStoreDOMapper.selectList(storeParams); @@ -77,9 +78,12 @@ public class StoreEmployeeService { } List storeUserDTOS = new ArrayList<>(); if (CollectionUtils.isNotEmpty(poiStores)){ + int orderNum = (pageNum -1) * pageSize; for(PoiStore store : poiStores) { StoreUserDTO storeUserDTO = new StoreUserDTO(); BeanUtils.copyProperties(store,storeUserDTO); + //设置序号 + storeUserDTO.setOrderNum(++orderNum); //查询店铺绑定的企业微信 QueryWrapper relationParams = new QueryWrapper<>(); relationParams.eq(DATABASE_STORE_ID_KEY,storeUserDTO.getId()); @@ -95,6 +99,7 @@ public class StoreEmployeeService { // poiStoreStaffDOMapper } } + Page pageList = (Page)storeUserDTOS; } diff --git a/src/main/resources/门店号批量开通模板.xlsx b/src/main/resources/门店号批量开通模板.xlsx deleted file mode 100644 index 89fc8f2..0000000 Binary files a/src/main/resources/门店号批量开通模板.xlsx and /dev/null differ