From 3d66a05e01b17a57f80a422b19fbbff92a69c080 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 19 二月 2025 16:15:03 +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/controller/pp/ReportWorkController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java
index fcd98ef..67fe761 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java
@@ -1,4 +1,30 @@
package com.example.erp.controller.pp;
+import com.example.erp.common.Result;
+import com.example.erp.entity.pp.ReportingWorkDetail;
+import com.example.erp.service.pp.ReportWorkService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping("/reportData")
public class ReportWorkController {
+
+ @Autowired
+ ReportWorkService reportWorkService;
+
+ /*杩斿伐绠＄悊鏁版嵁*/
+ @PostMapping("/rework/manage/query/{pageNum}/{pageSize}/{startTime}/{endTime}")
+ public Result queryReworkData(@PathVariable Integer pageNum, @PathVariable Integer pageSize
+ ,@PathVariable String startTime,@PathVariable String endTime
+ ) {
+ return Result.seccess(reportWorkService.reworkMangageData(pageNum, pageSize,startTime,endTime));
+ }
+
+ /*杩斿伐鏂板鏁版嵁鏌ヨ*/
+ @PostMapping("/rework/add/query/{pageNum}/{pageSize}")
+ public Result queryReworkAdd(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReportingWorkDetail reportingWorkDetail) {
+ return Result.seccess(reportWorkService.queryRework(pageNum, pageSize,reportingWorkDetail));
+ }
}
--
Gitblit v1.8.0