From 05dbb19d1826ae4b888340d53b56746c1efa66cc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 11 五月 2024 14:55:57 +0800
Subject: [PATCH] 登录时获取用户权限
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 6ebc1c9..ac84714 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -2,7 +2,10 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.pp.Report;
+import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReportService;
@@ -13,21 +16,60 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@Api(value="鐢熶骇鎶ヨ〃controller",tags={"鐢熶骇鎶ヨ〃鎿嶄綔鎺ュ彛"})
@RequestMapping("/report")
public class ReportController {
- @Autowired
- ReportService reportService;
+ private final ReportService reportService;
+
+ public ReportController(ReportService reportService) {
+ this.reportService = reportService;
+ }
//娴佺▼鍗¤繘搴�
@ApiOperation("娴佺▼鍗¤繘搴�")
@PostMapping ("/processCardProgress/{orderId}")
- public Result processCardProgress(
- @PathVariable String orderId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(reportService.processCardProgressSv(orderId,flowCard));
+ public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns){
+ return Result.seccess(reportService.processCardProgressSv(orderId,columns));
}
+
+ @ApiOperation("璺ㄥ伐搴忔鐮�")
+ @PostMapping("/crossProcessBreaking/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOrderReport(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody DamageDetails damageDetails) {
+ return Result.seccess(reportService.crossProcessBreakingSv(pageNum,pageSize,selectDate,damageDetails));
+
+ }
+
+ @ApiOperation("鍦ㄥ埗鍝佹姤琛�")
+ @PostMapping("/workInProgress/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
+ public Result workInProgress(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.workInProgressSv(selectTime1,selectTime2,orderId,inputProject,selectProcesses,report));
+
+ }
+
+ @ApiOperation("宸ュ簭寰呭畬鎴愭姤琛�")
+ @PostMapping("/selectProcessToBeCompleted/{selectTime1}/{selectTime2}/{orderId}/{inputProject}/{selectProcesses}")
+ public Result selectProcessToBeCompleted(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
+ @PathVariable String selectProcesses,
+ @RequestBody Report report) {
+ return Result.seccess(reportService.selectProcessToBeCompletedSv(selectTime1,selectTime2,orderId,inputProject,selectProcesses,report));
+
+ }
+
}
--
Gitblit v1.8.0