From d5bcb7deecd599a752d62333b8dc976228498b55 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 18 七月 2022 10:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/WorksheetMainController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index c720047..77428db 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -14,29 +14,34 @@
@RestController
@RequestMapping("worksheetMain")
-@Api(tags = "宸ュ崟娴佺▼")
+@Api(tags = "宸ヤ綔娴�")
public class WorksheetMainController {
@Autowired
private WorksheetMainService service;
@PostMapping("submit")
- @ApiOperation("宸ュ崟鎻愪氦")
+ @ApiOperation("鍥剧焊鎻愪氦")
public Response submit(@RequestBody WorksheetMain main){
- service.submit(main);
- return new Response().setII(1,"宸ュ崟鎻愪氦瀹屾垚");
+ DocUser user = ActionUtil.getUser();
+ boolean res = service.submit(main,user);
+ if(res) {
+ return new Response().set(1,true, "鎻愪氦瀹屾垚");
+ }else{
+ return new Response().set(1,false,"瑙掕壊鏃犳硶鎻愪氦鍥剧焊");
+ }
}
@GetMapping("list")
- @ApiOperation("鑾峰彇宸ュ崟娴佺▼-鐢ㄦ埛瀵瑰簲鐨勫緟澶勭悊/宸插鐞�/宸叉彁浜�/宸查┏鍥�")
+ @ApiOperation("鑾峰彇宸ヤ綔娴�-鍚勮鑹茬敤鎴峰搴旂殑宸ヤ綔鍙版暟鎹垎绫�")
public Response getList(){
DocUser user = ActionUtil.getUser();
- Map<String,WorksheetMain> map = service.getList();
+ Map<String,WorksheetMain> map = service.getList(user);
return new Response().set(1,map);
}
@GetMapping("linkInfo")
- @ApiOperation("鑾峰彇宸ュ崟娴佺▼-鍗曚釜宸ュ崟淇℃伅娴�")
+ @ApiOperation("鑾峰彇宸ヤ綔娴�-鍗曚釜淇℃伅娴�")
public Response getLinkList(@RequestParam int id){
WorksheetMain main = service.getLinkList(id);
return new Response().set(1,main);
--
Gitblit v1.9.1