From a27ce393f9924c044dfe743b220f0300f33e79d3 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期二, 06 八月 2024 15:47:14 +0800
Subject: [PATCH] 合并相关文件
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index 17c0a89..e4ac1e7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -5,8 +5,10 @@
import com.example.erp.common.Result;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.ReportingWork;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ReportingWorkService;
+import com.example.erp.service.userInfo.LogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,12 +22,15 @@
public class ReportingWorkController {
final
ReportingWorkService reportingWorkService;
+ LogService logService;
- public ReportingWorkController(ReportingWorkService reportingWorkService) {
+ public ReportingWorkController(ReportingWorkService reportingWorkService,LogService logService) {
this.reportingWorkService = reportingWorkService;
+ this.logService = logService;
}
@ApiOperation("鎶ュ伐鏂板鏌ヨ")
+ @SaCheckPermission("AddReportingWork.search")
@PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
public Result AddSelectLastWork(
@PathVariable String processIdStr,
@@ -81,15 +86,12 @@
@ApiOperation("鍒犻櫎鎶ュ伐鎺ュ彛")
@SaCheckPermission("SelectReportingWorks.delete")
- @PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}")
- public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,@PathVariable String thisProcess){
-// if(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess)){
-// return Result.seccess();
-// }else {
-// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚︾鍚堝垹闄ゆ潯浠�");
-//
-// }
- return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess));
+ @PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}/{userId}/{userName}")
+ public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,
+ @PathVariable String thisProcess,@PathVariable String userId
+ ,@PathVariable String userName){
+
+ return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));
}
@@ -130,4 +132,12 @@
return Result.seccess(reportingWorkService.detailsQualitySv(reportingWorkId,processId,thisProcess,reportingWork));
}
+
+ @ApiOperation("琛ョ墖鐘舵�佹煡璇�")
+ @PostMapping ("/getPatchCondition/{reportingWorkId}")
+ public Result getPatchCondition(
+ @PathVariable String reportingWorkId) {
+ return Result.seccess(reportingWorkService.getPatchConditionSv(reportingWorkId));
+ }
+
}
--
Gitblit v1.8.0