From e3ffd75c3e1ae659b3b803d211166ba14bda4548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 04 六月 2026 17:18:53 +0800
Subject: [PATCH] feat(report): 报表图表管理 1.报表管理(样品进度报表,检测项目数据,样品领样记录,设备使用记录) 2.数字化语音看板 3.智能图表

---
 performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java
index 2bacdd7..dd22d6c 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOriginalHoursServiceImpl.java
@@ -226,10 +226,10 @@
         DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String beginDate = previousMonth26th.atStartOfDay().format(outputFormatter);
         String endDate = currentMonth25th.atStartOfDay().format(outputFormatter);
-//        dto.setBeginDate(beginDate + " 00:00:00");
-//        dto.setEndDate(endDate + " 23:59:59");
-        dto.setBeginDate(beginDate);
-        dto.setEndDate(endDate);
+        dto.setBeginDate(beginDate + " 00:00:00");
+        dto.setEndDate(endDate + " 23:59:59");
+        dto.setAssistBeginDate(beginDate);
+        dto.setAssistEndDate(endDate);
 
 
         // 鏌ヨ浜ч噺宸ユ椂

--
Gitblit v1.9.3