diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java index ef00f80..09712cc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java @@ -209,8 +209,8 @@ public class DevInfoController extends BaseController { */ @ApiOperation(value = "装备专业统计") @GetMapping("/sumProfession") - public AjaxResult sumProfession() { - return success(devInfoService.sumProfession()); + public AjaxResult sumProfession(Integer maStatus) { + return success(devInfoService.sumProfession(maStatus)); } /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java index 0915316..ee72702 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevInfoService.java @@ -90,7 +90,7 @@ public interface DevInfoService { Map sumType(String brand, String modelName); - Map sumProfession(); + Map sumProfession(Integer maStatus); List selectDevInfoLists(DevInfoVo devInfo); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index adbba27..4969d23 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -711,8 +711,11 @@ public class DevInfoServiceImpl implements DevInfoService { * 装备专业统计 */ @Override - public Map sumProfession() { + public Map sumProfession(Integer maStatus) { DevInfoVo devInfoVo = new DevInfoVo(); + if (null != maStatus) { + devInfoVo.setMaStatus(maStatus); + } Map sumTypeMap = new IdentityHashMap<>(); //获取所有的装备信息 List devInfoList = devInfoMapper.selectDevInfoList(devInfoVo);