diff --git a/src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java b/src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java index e2356db..514f3bb 100644 --- a/src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java +++ b/src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java @@ -1,5 +1,6 @@ package com.huaheng.pc.config.locationType.controller; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -14,16 +15,16 @@ import com.huaheng.framework.web.domain.AjaxResult; import com.huaheng.framework.web.page.PageDomain; import com.huaheng.framework.web.page.TableDataInfo; import com.huaheng.framework.web.page.TableSupport; -import com.huaheng.pc.general.location.domain.Location; import com.huaheng.pc.config.locationType.domain.LocationType; -import com.huaheng.pc.general.location.service.LocationService; import com.huaheng.pc.config.locationType.service.LocationTypeService; +import com.huaheng.pc.general.location.domain.Location; +import com.huaheng.pc.general.location.service.LocationService; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.Arrays; import java.util.List; @@ -33,15 +34,16 @@ public class LocationTypeController extends BaseController { private String prefix = "config/locationType"; - @Resource + @Autowired private LocationTypeService locationTypeService; - @Resource + @Autowired private LocationService locationService; @RequestMapping("config:locationType:view") - @GetMapping - public String locationType() { - return prefix + "/location"; + @GetMapping() + public String locationType() + { + return prefix + "/locationType"; } /** @@ -57,7 +59,7 @@ public class LocationTypeController extends BaseController { Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); - lambdaQueryWrapper.eq(LocationType::getWarehouseCode,ShiroUtils.getWarehouseCode()); + lambdaQueryWrapper.eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode()); if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ /** diff --git a/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java b/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java index 0f28b7d..e910ec5 100644 --- a/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java +++ b/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java @@ -66,7 +66,7 @@ public class ZoneController extends BaseController { */ Page<Zone> page = new Page<>(pageNum, pageSize); IPage<Zone> iPage = zoneService.page(page, lambdaQueryWrapper); - return getDataTable(iPage.getRecords()); + return getMpDataTable(iPage.getRecords(),iPage.getTotal()); } else { List<Zone> list = zoneService.list(lambdaQueryWrapper); return getDataTable(list); diff --git a/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java b/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java index 50a641a..8ae79a4 100644 --- a/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java +++ b/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java @@ -73,7 +73,7 @@ public class ZoneCapacityController extends BaseController */ Page<ZoneCapacity> page = new Page<>(pageNum, pageSize); IPage<ZoneCapacity> iPage = zoneCapacityService.page(page, lambdaQueryWrapper); - return getDataTable(iPage.getRecords()); + return getMpDataTable(iPage.getRecords(),iPage.getTotal()); } else { List<ZoneCapacity> list = zoneCapacityService.list(lambdaQueryWrapper); return getDataTable(list);