From a97c0e84c8d1f50aa65935643a580527f30b7ece Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 12 三月 2024 08:39:38 +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 |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 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
new file mode 100644
index 0000000..67fe761
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportWorkController.java
@@ -0,0 +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