From bace2ae27da05bcdcca2bc3b1ee543b93ac7e3f7 Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期二, 19 七月 2022 15:16:42 +0800
Subject: [PATCH] excel解析
---
src/main/java/com/whyc/controller/WorksheetMainController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index c720047..43e8233 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -2,6 +2,7 @@
import com.whyc.dto.Response;
import com.whyc.pojo.DocUser;
+import com.whyc.pojo.ProductBomApproving;
import com.whyc.pojo.WorksheetMain;
import com.whyc.service.WorksheetMainService;
import com.whyc.util.ActionUtil;
@@ -10,33 +11,39 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("worksheetMain")
-@Api(tags = "宸ュ崟娴佺▼")
+@Api(tags = "宸ヤ綔娴�")
public class WorksheetMainController {
@Autowired
private WorksheetMainService service;
@PostMapping("submit")
- @ApiOperation("宸ュ崟鎻愪氦")
- public Response submit(@RequestBody WorksheetMain main){
- service.submit(main);
- return new Response().setII(1,"宸ュ崟鎻愪氦瀹屾垚");
+ @ApiOperation("浜у搧鍥剧焊鍙奲om鎻愪氦")
+ public Response submit(@RequestBody WorksheetMain main, @RequestBody List<ProductBomApproving> bomList){
+ 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