From c38cc86b12210d79103e642b401906ae0fce7c9c Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Thu, 18 Sep 2025 20:32:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A3=85=E5=A4=87=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=93=81=E7=89=8C=E5=92=8C=E5=9E=8B=E5=8F=B7=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/device/controller/DevInfoController.java | 4 ++-- .../com/bonus/material/device/service/DevInfoService.java | 2 +- .../material/device/service/impl/DevInfoServiceImpl.java | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) 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 c95aa90..ef00f80 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 @@ -200,8 +200,8 @@ public class DevInfoController extends BaseController { */ @ApiOperation(value = "装备状态统计") @GetMapping("/sumType") - public AjaxResult sumType() { - return success(devInfoService.sumType()); + public AjaxResult sumType(@RequestParam(value = "brand", required = false) String brand, @RequestParam(value = "modelName", required = false) String modelName) { + return success(devInfoService.sumType(brand, modelName)); } /** 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 5d6205f..0915316 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 @@ -88,7 +88,7 @@ public interface DevInfoService { */ AjaxResult insertDevInfo(DevInfo devInfo); - Map sumType(); + Map sumType(String brand, String modelName); Map sumProfession(); 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 a404555..cf54943 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 @@ -682,8 +682,10 @@ public class DevInfoServiceImpl implements DevInfoService { * 装备状态统计 */ @Override - public Map sumType() { + public Map sumType(String brand, String modelName) { DevInfoVo devInfoVo = new DevInfoVo(); + devInfoVo.setBrand(brand); + devInfoVo.setModelName(modelName); Map sumTypeMap = new IdentityHashMap<>(); //获取所有的装备信息 List devInfoList = devInfoMapper.selectDevInfoList(devInfoVo);