From 476740c4330135b38be6a32f54dbe1bbcd32476a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 13 一月 2025 13:20:56 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
index c4bd75b..e9ecc0a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
@@ -1,6 +1,9 @@
package com.yuanchu.mom.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.InsOrderUserDto;
import com.yuanchu.mom.pojo.Schedule;
import java.util.List;
@@ -24,8 +27,11 @@
List<Schedule> ScheduleByMe(String date);
//棣栭〉-->鍚勭珯鐐瑰伐鏃�
- Map<String,Double> manHourByStation(String startTime,String endTime);
+ String manHourByStation(String startTime,String endTime,String sonLaboratory);
//棣栭〉-->鍚勭珯鐐瑰伐鏃舵瘡涓汉鎵�鍗犵櫨鍒嗘瘮
- Map<String, Map<String, Double>> manHourByPerson(String startTime, String endTime);
+ Map<Object, Double> manHourByPerson(String startTime, String endTime,String sonLaboratory);
+
+ //鏌ヨ绔欑偣鐨勬楠屾椂闀�
+ Map<String, IPage<InsOrderUserDto>> timeByStation(String startTime, String endTime, Page page, String sonLaboratory);
}
--
Gitblit v1.9.3