From 24cb4c00895e93e3f54c6cc268ea2c44e17d1026 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 11 九月 2023 11:27:07 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/SOPController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/SOPController.java b/src/main/java/com/whyc/controller/SOPController.java
index 84ac386..f4e1874 100644
--- a/src/main/java/com/whyc/controller/SOPController.java
+++ b/src/main/java/com/whyc/controller/SOPController.java
@@ -3,6 +3,7 @@
import com.whyc.dto.Response;
import com.whyc.dto.SopDto;
import com.whyc.pojo.SOP;
+import com.whyc.pojo.SOPLockLog;
import com.whyc.service.SOPService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
@@ -53,6 +54,12 @@
return service.getSopInfo(list,code,model,pageCurr,pageSize);
}
+ @ApiOperation("鏌ヨsop鍘嗗彶")
+ @GetMapping("getSopHis")
+ public Response getSopHis(@RequestParam(required = false) String fileName) {
+ return service.getSopHis(fileName);
+ }
+
@ApiOperation("鏇存柊sop璇存槑锛堜笉鍚攣淇℃伅锛�")
@PostMapping("updateSop")
public Response updateSop(@RequestBody SOP sop) {
@@ -60,9 +67,9 @@
}
@ApiOperation("璁剧疆sop鏈夋晥鐘舵��")
- @PutMapping("activeById")
- public Response updateStatusById(@RequestParam int id,@RequestParam int status) {
- return service.updateStatusById(id,status);
+ @PutMapping("updateStatusById")
+ public Response updateStatusById(@RequestBody SOPLockLog lockLog) {
+ return service.updateStatusById(lockLog);
}
}
--
Gitblit v1.9.1