From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
index 822e566..ad2b7a4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
@@ -1,4 +1,44 @@
package com.example.erp.service.pp;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.entity.pp.ReportingWorkDetail;
+import com.example.erp.mapper.pp.ReportingWorkDetailMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@DS("pp")
public class ReportWorkService {
+
+ @Autowired
+ ReportingWorkDetailMapper reportingWorkDetailMapper;
+
+ /*鑾峰彇杩斿伐鏂板鍔熻兘鏁版嵁*/
+ public Map<String,Object> queryRework (Integer pageNum, Integer pageSize,ReportingWorkDetail reportingWorkDetail ) {
+ Integer offset = (pageNum-1)*pageSize;
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportingWorkDetailMapper.queryReworkAdd(offset,pageSize, reportingWorkDetail));
+ return map;
+ };
+
+
+
+ /*鑾峰彇杩斿伐绠＄悊鏁版嵁*/
+ public Map<String,Object> reworkMangageData (Integer pageNum, Integer pageSize,String startTime,String endTime) {
+ Integer offset = (pageNum-1)*pageSize;
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportingWorkDetailMapper.reworkDataManage(offset,pageSize,startTime,endTime));
+ return map;
+ };
+
+ /*鑾峰彇杩斿伐绠＄悊鏁版嵁*/
+ public Map<String,Object> reworkMangageData2 (Integer pageNum, Integer pageSize,String startTime,String endTime,ReportingWorkDetail reportingWorkDetail ) {
+ Integer offset = (pageNum-1)*pageSize;
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportingWorkDetailMapper.reworkDataManage2(offset,pageSize,startTime,endTime, reportingWorkDetail));
+ return map;
+ };
}
--
Gitblit v1.8.0