From dee985829fd3dcadc877a30ca86c42e9f7b0cdd8 Mon Sep 17 00:00:00 2001
From: HuangHuiKang <HuangHuiKang@qq.com>
Date: Wed, 15 Apr 2026 16:34:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8B=BE=E9=80=89=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/baogongrecord/BaogongRecordController.java       | 1 -
 .../admin/baogongrecord/vo/BaogongRecordStatPageReqVO.java | 4 ++++
 .../admin/baogongrecord/vo/BaogongRecordStatRespVO.java    | 6 ++++++
 .../resources/mapper/baogongrecord/BaogongRecordMapper.xml | 7 +++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java
index 39fb41778..138bd6cd0 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java
@@ -171,5 +171,4 @@ public class BaogongRecordController {
         return success(baogongRecordService.getBaogongRecordTrend(reqVO));
     }
 
-
 }
\ No newline at end of file
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/vo/BaogongRecordStatPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/vo/BaogongRecordStatPageReqVO.java
index 2acbb6285..ea4141737 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/vo/BaogongRecordStatPageReqVO.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/vo/BaogongRecordStatPageReqVO.java
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -23,4 +24,7 @@ public class BaogongRecordStatPageReqVO extends PageParam {
     @Schema(description = "结束时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime endBaogongTime;
+
+    @Schema(description = "报工记录ID集合（用于多选导出）")
+    private List<Long> ids;
 }
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/vo/BaogongRecordStatRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/vo/BaogongRecordStatRespVO.java
index 59ebdb35c..df7894ff8 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/vo/BaogongRecordStatRespVO.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/vo/BaogongRecordStatRespVO.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.controller.admin.baogongrecord.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -12,6 +13,10 @@ import java.time.LocalDateTime;
 @Data
 public class BaogongRecordStatRespVO {
 
+
+    @Schema(description = "报工记录Id")
+    private String id;
+
     @Schema(description = "任务单编码")
     @ExcelProperty("任务单编码")
     private String taskCode;
@@ -58,6 +63,7 @@ public class BaogongRecordStatRespVO {
 
     @Schema(description = "报工时间")
     @ExcelProperty("报工时间")
+    @ColumnWidth(20)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime baogongTime;
 }
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/baogongrecord/BaogongRecordMapper.xml b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/baogongrecord/BaogongRecordMapper.xml
index 526e3384b..372d39dbc 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/baogongrecord/BaogongRecordMapper.xml
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/resources/mapper/baogongrecord/BaogongRecordMapper.xml
@@ -12,6 +12,7 @@
     <select id="selectStatPage"
             resultType="cn.iocoder.yudao.module.mes.controller.admin.baogongrecord.vo.BaogongRecordStatRespVO">
         SELECT
+        r.id,
         t.code AS taskCode,
         p.code AS planCode,
         r.creator AS employeeId,
@@ -39,6 +40,12 @@
         <if test="reqVO.endBaogongTime != null">
             AND r.baogong_time &lt;= #{reqVO.endBaogongTime}
         </if>
+        <if test="reqVO.ids != null and reqVO.ids.size() > 0">
+            AND r.id IN
+            <foreach collection="reqVO.ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY r.baogong_time DESC
     </select>