From 7dabe70d802bcf672195f0f926360338e08d38a2 Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Tue, 16 Jun 2026 17:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B1=A5=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/dvrepair/DvRepairController.java | 17 ++++++++++++----- .../mes/service/dvrepair/DvRepairService.java | 2 +- .../service/dvrepair/DvRepairServiceImpl.java | 10 +++++----- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java index f28dee666..8a94379b7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.dvrepair; +import cn.hutool.core.bean.BeanUtil; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -28,6 +29,7 @@ import java.io.IOException; import java.net.URLEncoder; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -186,11 +188,11 @@ public class DvRepairController { @Operation(summary = "根据设备Id获得维修历史记录") @Parameter(name = "deviceId", description = "设备Id", required = false, example = "1024") @PreAuthorize("@ss.hasPermission('mes:ticket-management:query')") - public CommonResult> getRepairListByDeviceId(@RequestParam(value = "deviceId", required = false) Long deviceId, + public CommonResult> getRepairListByDeviceId(@RequestParam(value = "deviceId", required = false) Long deviceId, @RequestParam(value = "code", required = false) String code, @RequestParam(name = "startTime",required = false) String startTime, @RequestParam(name = "endTime",required = false) String endTime) { - List dvRepairDOList = dvRepairService.getRepairListByDeviceId(deviceId, code, startTime, endTime, null); + List dvRepairDOList = dvRepairService.getRepairListByDeviceId(deviceId, code, startTime, endTime, null); return success(dvRepairDOList); } @@ -207,8 +209,13 @@ public class DvRepairController { HttpServletResponse response) throws IOException { // 查询数据 - List dvRepairDOList = dvRepairService.getRepairListByDeviceId(deviceId, null, startTime, endTime, ids); - + List dvRepairDOList = dvRepairService.getRepairListByDeviceId(deviceId, null, startTime, endTime, ids); + List dvRepairLineRespVOS = new ArrayList<>(); + dvRepairDOList.stream().forEach(dvRepairDO -> { + DvRepairLineRespVO dvRepairLineRespVO = new DvRepairLineRespVO(); + BeanUtil.copyProperties(dvRepairDO, dvRepairLineRespVO); + dvRepairLineRespVOS.add(dvRepairLineRespVO); + }); // 设置响应头 response.setContentType("application/vnd.ms-excel;charset=UTF-8"); response.setHeader("Content-Disposition", @@ -216,7 +223,7 @@ public class DvRepairController { response.setHeader("Content-Encoding", "identity"); // 导出Excel String fileName = String.format("维修记录_%s.xls", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); - ExcelUtils.write(response, fileName, "维修记录", DvRepairLineRespVO.class, dvRepairDOList); + ExcelUtils.write(response, fileName, "维修记录", DvRepairLineRespVO.class, dvRepairLineRespVOS); } private PageResult buildCreatorName(PageResult dvSubjectRespVOPageResult) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java index 600f83a7c..cf11e547a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java @@ -71,7 +71,7 @@ public interface DvRepairService { void updateDvRepairStatus(@Valid DvRepirUpdateReqVO updateReqVO); - List getRepairListByDeviceId(Long deviceId, String code, String startTime, String endTime, String ids); + List getRepairListByDeviceId(Long deviceId, String code, String startTime, String endTime, String ids); Long getRepairListCountByRepairStatus(); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java index e4cb5afce..b2d48e6f0 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java @@ -239,7 +239,7 @@ public class DvRepairServiceImpl implements DvRepairService { } @Override - public List getRepairListByDeviceId(Long deviceId, String code, String startTime, String endTime, String ids) { + public List getRepairListByDeviceId(Long deviceId, String code, String startTime, String endTime, String ids) { DeviceLedgerDO deviceLedgerDO = getDeviceByIdOrCode(deviceId, code); List dvRepairLineRespVOS = new ArrayList<>(); @@ -271,7 +271,7 @@ public class DvRepairServiceImpl implements DvRepairService { List dvRepairDOS = dvRepairMapper.selectList(wrapper); - for (DvRepairDO dvRepairDO : dvRepairDOS) { + /*for (DvRepairDO dvRepairDO : dvRepairDOS) { LambdaQueryWrapper dvRepairLineDOLambdaQueryWrapper = Wrappers.lambdaQuery() .eq(DvRepairLineDO::getRepairId, dvRepairDO.getId()) @@ -294,7 +294,7 @@ public class DvRepairServiceImpl implements DvRepairService { .collect(Collectors.toList()); dvRepairLineRespVOS.addAll(dvRepairLineRespVOList); } - } + }*/ // 在最终结果上过滤ids if (StringUtils.isNotBlank(ids)) { @@ -304,14 +304,14 @@ public class DvRepairServiceImpl implements DvRepairService { .map(Long::valueOf) .collect(Collectors.toList()); if (!idList.isEmpty()) { - dvRepairLineRespVOS = dvRepairLineRespVOS.stream() + dvRepairDOS = dvRepairDOS.stream() .filter(vo -> idList.contains(vo.getId())) // 假设vo有getId()方法 .collect(Collectors.toList()); } } - return dvRepairLineRespVOS; + return dvRepairDOS; } private DeviceLedgerDO getDeviceByIdOrCode(Long deviceId, String code) {