From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 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
new file mode 100644
index 0000000..ad2b7a4
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportWorkService.java
@@ -0,0 +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