From d9cbc0b1d58acceaf77fc5e88e390222ac99ce22 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 13 Nov 2025 18:12:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ScrapApplyDetailsController.java | 13 ++++++++++++- .../material/scrap/domain/vo/ScrapTaskListVo.java | 7 +++++++ .../material/scrap/ScrapApplyDetailsMapper.xml | 4 +++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java index b91318a6..9b54ffff 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.convert.Convert; 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.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; @@ -238,9 +239,19 @@ public class ScrapApplyDetailsController extends BaseController { @SysLog(title = "报废任务详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出报废任务详细") @PostMapping("/export") public void export(HttpServletResponse response, ScrapApplyDetails scrapApplyDetails) { + String fileName = "报废审核列表"; + if (scrapApplyDetails.getStartTime() != null && scrapApplyDetails.getEndTime() != null) { + fileName = "报废审核列表"+ "（时间" +scrapApplyDetails.getStartTime() + "至" + scrapApplyDetails.getEndTime()+ "）"; + } List list = scrapApplyDetailsService.selectScrapApplyDetailsList(scrapApplyDetails); + // 根据list集合数，去填充序号 + for (int i = 0; i < list.size(); i++) { + list.get(i).setSeq(i + 1); + } ExcelUtil util = new ExcelUtil<>(ScrapTaskListVo.class); - util.exportExcel(response, list, "报废任务详细数据"); + // 获取当前年月日时分秒导出时间，用括号拼接在后面 + String title = "报废审核列表" + "（" + "导出时间：" + DateUtils.getTime() + "）"; + util.exportExcel(response, list, fileName, title); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapTaskListVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapTaskListVo.java index aa555989..03b107ae 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapTaskListVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/domain/vo/ScrapTaskListVo.java @@ -39,6 +39,13 @@ public class ScrapTaskListVo { @ApiModelProperty(value = "规格型号") private String typeName; + @ApiModelProperty(value = "序号") + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, width = 5) + private Integer seq; + + @ApiModelProperty(value = "分公司") + @Excel(name = "分公司") + private String impUnitName; @ApiModelProperty(value = "退料单位名称") @Excel(name = "退料单位") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml index 9dcae19b..10ca4d01 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml @@ -53,7 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND CHAR_LENGTH(sad.create_by) * 3 = LENGTH(sad.create_by) THEN sad.create_by -- 视为纯汉字，取sad.create_by ELSE COALESCE(su.nick_name, '未知创建人') -- 否则取su.nick_name - END AS createName + END AS createName, + sd.dept_name as impUnitName FROM scrap_apply_details sad LEFT JOIN ma_type mt on sad.type_id = mt.type_id @@ -67,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join repair_audit_details rad ON sad.parent_id = rad.id left join tm_task tt2 ON tt2.task_id = rad.task_id LEFT JOIN sys_user su ON su.user_name = sad.create_by + left join sys_dept sd on sd.dept_id = bpi.imp_unit where sad.scrap_source = '2' and type_id = #{typeId}