From 52cf44a64f9929a8030e0add48128c1ba38e6d55 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sat, 23 Nov 2024 16:40:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=A8=A1=E5=9D=97=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/controller/RepairController.java | 16 ++++++++-------- .../repair/domain/vo/RepairDeviceSummaryVo.java | 5 ++++- .../repair/domain/vo/RepairDeviceVO.java | 9 ++++++--- .../repair/service/impl/RepairServiceImpl.java | 4 +++- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index e2058af8..867ffb8c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -74,14 +74,14 @@ public class RepairController extends BaseController { /** * 获取维修任务物资设备列表--不分页 */ - @ApiOperation(value = "获取维修物资设备列表---分页") - @GetMapping("/getRepairMaTypeList") -// @RequiresPermissions("repair:manage:preview") - public TableDataInfo getRepairMaTypeList(RepairTaskDetails bean) { - startPage(); - List list = service.getRepairMaTypeList(bean); - return getDataTable(list); - } +// @ApiOperation(value = "获取维修物资设备列表---分页") +// @GetMapping("/getRepairMaTypeList") +//// @RequiresPermissions("repair:manage:preview") +// public TableDataInfo getRepairMaTypeList(RepairTaskDetails bean) { +// startPage(); +// List list = service.getRepairMaTypeList(bean); +// return getDataTable(list); +// } /** * 获取维修任务机具列表--Ⅱ级页面详情列表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java index d00078e0..9ef22eab 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java @@ -33,6 +33,9 @@ public class RepairDeviceSummaryVo extends BaseVO { @ApiModelProperty(value = "规格型号") private String type; + @ApiModelProperty(value = "设备单位") + private String unitName; + @ApiModelProperty(value = "管理模式") private Integer manageType; @@ -55,7 +58,7 @@ public class RepairDeviceSummaryVo extends BaseVO { // private Integer typeCostRecords; @ApiModelProperty(value = "维修费用合计") - private BigDecimal typeCostSum; + private BigDecimal typeCost; @ApiModelProperty(value = "内层物资类型集合") private List repairDeviceList = new ArrayList<>(); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java index 5dde494b..3cc04bca 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java @@ -40,6 +40,12 @@ public class RepairDeviceVO { @ApiModelProperty(value = "设备编码") private String code; + @ApiModelProperty(value = "设备单位") + private String unitName; + + @ApiModelProperty(value = "管理模式") + private Integer manageType; + @ApiModelProperty(value = "状态") private String status; @@ -52,9 +58,6 @@ public class RepairDeviceVO { @ApiModelProperty(value = "维修人员") private String repairer; - @ApiModelProperty(value = "管理模式") - private Integer manageType; - @ApiModelProperty(value = "附件") private String fileUrl; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index b7056ccb..52052c41 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -81,16 +81,18 @@ public class RepairServiceImpl implements RepairService { Long[] ids = tempList.stream().map(RepairDeviceVO::getId).toArray(Long[]::new); int repairNumSum = tempList.stream().mapToInt(RepairDeviceVO::getRepairNum).sum(); int repairedNumSum = tempList.stream().mapToInt(RepairDeviceVO::getRepairedNum).sum(); - //BigDecimal typeCostSum = tempList.stream().map(RepairDeviceVO::getRepairedNum).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal typeCostSum = tempList.stream().map(RepairDeviceVO::getTotalCost).reduce(BigDecimal.ZERO, BigDecimal::add); vo.setRepairDeviceList(tempList); vo.setIds(ids); vo.setTypeRepairNum(repairNumSum); vo.setTypeRepairedNum(repairedNumSum); + vo.setTypeCost(typeCostSum); vo.setTaskId(tempList.get(0).getTaskId()); vo.setCode(tempList.get(0).getCode()); vo.setTypeName(tempList.get(0).getTypeName()); vo.setTypeId(tempList.get(0).getTypeId()); vo.setType(tempList.get(0).getType()); + vo.setUnitName(tempList.get(0).getUnitName()); vo.setManageType(tempList.get(0).getManageType()); repairDeviceSummaryVoList.add(vo); }