From 9003c841476dae3fbf3bc92248a3fcc511c229e6 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Sat, 11 Oct 2025 17:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=88?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepairAuditDetailsController.java | 21 +++++++++++++- .../repair/domain/vo/ScrapApplyDetailsVO.java | 28 +++++++++---------- .../repair/RepairAuditDetailsMapper.xml | 8 ++++-- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index 7677b56b..0f5fb18f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -1,5 +1,6 @@ package com.bonus.material.repair.controller; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import javax.annotation.Resource; @@ -11,6 +12,7 @@ import com.bonus.common.biz.annotation.StoreLog; import com.bonus.common.biz.config.ListPagingUtil; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.ServletUtils; +import com.bonus.common.core.utils.bean.BeanUtils; import com.bonus.common.log.enums.OperaType; import com.bonus.material.basic.domain.report.LeaseOutInfo; import com.bonus.material.basic.domain.report.PurChaseReportInfo; @@ -95,8 +97,25 @@ public class RepairAuditDetailsController extends BaseController { } repairAuditDetailsService.queryTimeCope(bean); List list = repairAuditDetailsService.selectRepairQuestList(bean); + List newList = new ArrayList<>(); + list.forEach(item -> { + RepairAuditDetails repairAuditDetails = new RepairAuditDetails(); + repairAuditDetails.setTaskId(item.getTaskId()); + List detailsList = repairAuditDetailsService.getRepairAuditList(repairAuditDetails); + detailsList.forEach(details -> { + ScrapApplyDetailsVO scrapApplyDetailsVO = new ScrapApplyDetailsVO(); + BeanUtils.copyProperties(item, scrapApplyDetailsVO); + scrapApplyDetailsVO.setTypeName(details.getSpecificationType()); + scrapApplyDetailsVO.setTypeName2(details.getMachineTypeName()); + scrapApplyDetailsVO.setRepairNum2(details.getRepairNum()); + scrapApplyDetailsVO.setRepairedNum(details.getRepairedNum()); + scrapApplyDetailsVO.setScrapNum3(details.getScrapNum()); + scrapApplyDetailsVO.setMaCode(details.getMaCode()); + newList.add(scrapApplyDetailsVO); + }); + }); ExcelUtil util = new ExcelUtil<>(ScrapApplyDetailsVO.class); - util.exportExcel(response, list, "修试审核任务列表", "修试审核数据一览表（导出时间：" + DateUtils.getTime() + "）"); + util.exportExcel(response, newList, "修试审核任务列表", "修试审核数据一览表（导出时间：" + DateUtils.getTime() + "）"); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java index 9ea7cdf5..2c77a966 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/ScrapApplyDetailsVO.java @@ -49,19 +49,25 @@ public class ScrapApplyDetailsVO { @Excel(name = "维修审核单号",sort = 4) private String auditCode; - - @Excel(name = "物资类型",sort = 5) + @ApiModelProperty(value = "机具编号") + @Excel(name = "设备编码",sort = 5) + private String maCode; + @Excel(name = "物资类型",sort = 6) private String typeName2; - - @Excel(name = "退料数量",sort = 6, cellType = Excel.ColumnType.NUMERIC) + /** + * 规格型号 + */ + @Excel(name = "规格型号",sort = 7) + private String typeName; + @Excel(name = "退料数量",sort = 8, cellType = Excel.ColumnType.NUMERIC) private BigDecimal repairNum2; - @Excel(name = "合格数量",sort = 7, cellType = Excel.ColumnType.NUMERIC) + @Excel(name = "合格数量",sort = 9, cellType = Excel.ColumnType.NUMERIC) private BigDecimal repairedNum; - @Excel(name = "报废数量",sort = 8, cellType = Excel.ColumnType.NUMERIC) + @Excel(name = "报废数量",sort = 10, cellType = Excel.ColumnType.NUMERIC) private BigDecimal scrapNum3; - @Excel(name = "维修人",sort = 9) + @Excel(name = "维修人",sort = 11) private String createBy2; - @Excel(name = "审核时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 10) + @Excel(name = "审核时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 12) private String auditTime; /** @@ -118,15 +124,9 @@ public class ScrapApplyDetailsVO { private String type; - /** - * 规格型号 - */ - private String typeName; - @ApiModelProperty(value = "机具编号") - private String maCode; /** 报废数量 */ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 88af071e..74da92c6 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -341,7 +341,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rn.repairedNum as repairedNum, tk.task_status AS taskStatus, rad.create_by AS createBy2, - rad.create_time AS auditTime + rad.create_time AS auditTime, + rad.create_time AS createTime, + tk.CODE AS repairCode FROM tm_task tk LEFT JOIN repair_audit_details rad ON tk.task_id = rad.task_id @@ -417,7 +419,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rn.repairedNum as repairedNum, tk.task_status AS taskStatus, su.nick_name AS createBy2, - rad.audit_time AS auditTime + rad.audit_time AS auditTime, + rad.create_time AS createTime, + tk.CODE AS repairCode FROM tm_task tk LEFT JOIN (