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 | 3 ---
1 files changed, 0 insertions(+), 3 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 a3d3e44..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
@@ -19,7 +19,6 @@
/*鑾峰彇杩斿伐鏂板鍔熻兘鏁版嵁*/
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;
@@ -30,7 +29,6 @@
/*鑾峰彇杩斿伐绠＄悊鏁版嵁*/
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;
@@ -39,7 +37,6 @@
/*鑾峰彇杩斿伐绠＄悊鏁版嵁*/
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