From f40f45162d69d751628a8fa0c6784abb237d4eaa Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期六, 03 九月 2022 16:48:11 +0800
Subject: [PATCH] 问题修复
---
src/main/java/com/whyc/controller/WorksheetMainController.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index d0b6fed..f58a6c2 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -3,6 +3,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.dto.WorksheetMainDTO;
+import com.whyc.dto.WorksheetMainDTO2;
import com.whyc.pojo.DocUser;
import com.whyc.pojo.WorksheetMain;
import com.whyc.service.WorksheetMainService;
@@ -11,9 +12,9 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
-import java.util.List;
+import java.io.IOException;
import java.util.Map;
@RestController
@@ -26,7 +27,7 @@
@PostMapping("submit")
@ApiOperation("浜у搧鍥剧焊鍙奲om鎻愪氦")
- public Response submit(@RequestBody WorksheetMain main){
+ public Response submit(@RequestBody WorksheetMain main) throws IOException {
DocUser user = ActionUtil.getUser();
boolean res = service.submit(main,user);
if(res) {
@@ -36,11 +37,11 @@
}
}
- @PostMapping("componentRelatedSubmit")
- @ApiOperation(value="鏁ｈ浠�-浜у搧瀹℃壒鎻愪氦")
- public Response componentProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
+ @PostMapping("materialRelatedSubmit")
+ @ApiOperation(value="鐗╂枡-浜у搧瀹℃壒鎻愪氦")
+ public Response materialProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
DocUser user = ActionUtil.getUser();
- boolean res = service.componentProductSubmit(mainDTO,user);
+ boolean res = service.MaterialProductSubmit(mainDTO,user);
if(res) {
return new Response().set(1,true, "鎻愪氦瀹屾垚");
}else{
@@ -48,12 +49,12 @@
}
}
- @PostMapping("componentSubmit")
- @ApiOperation(value="鏁ｈ浠跺鎵规彁浜�")
- public Response componentSubmit(@RequestBody WorksheetMain main){
+ @PostMapping("materialSubmit")
+ @ApiOperation(value="鐗╂枡瀹℃壒鎻愪氦")
+ public Response materialSubmit(@RequestBody WorksheetMain main){
Response<Object> response = new Response<>();
DocUser user = ActionUtil.getUser();
- Response res = service.componentSubmit(main,user);
+ Response res = service.materialSubmit(main,user);
if(res.getCode()==1) {
response.set(1,true, "鎻愪氦瀹屾垚");
}else if(res.getCode()==3){
@@ -61,22 +62,30 @@
}else{
//閲嶅鎻愪氦
Object existCAList = res.getData();
- Object existComponentList = res.getData2();
+ Object existMaterialList = res.getData2();
response.setCode(1);
response.setData(false);
response.setData2(existCAList);
- response.setData3(existComponentList);
+ response.setData3(existMaterialList);
if(res.getCode()==21){
- response.setMsg("閲嶅鎻愪氦:鐜版湁鏁ｈ浠跺強姝ｅ湪杩涜瀹℃壒鐨勬暎瑁呬欢涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
+ response.setMsg("閲嶅鎻愪氦:鐜版湁鐗╂枡鍙婃鍦ㄨ繘琛屽鎵圭殑鐗╂枡涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
}else if(res.getCode()==22){
- response.setMsg("閲嶅鎻愪氦:姝ｅ湪杩涜瀹℃壒鐨勬暎瑁呬欢涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
+ response.setMsg("閲嶅鎻愪氦:姝ｅ湪杩涜瀹℃壒鐨勭墿鏂欎腑,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勭墿鏂�");
}else{
- response.setMsg("閲嶅鎻愪氦:鐜版湁鏁ｈ浠朵腑,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
+ response.setMsg("閲嶅鎻愪氦:鐜版湁鐗╂枡涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勭墿鏂�");
}
}
return response;
}
+ @PostMapping("productSoftwareSubmit")
+ @ApiOperation(value="浜у搧杞欢瀹℃壒鎻愪氦")
+ public Response productSoftwareSubmit(@RequestParam MultipartFile multipartFile,@RequestParam String mainDTOString) throws IOException {
+ DocUser user = ActionUtil.getUser();
+ WorksheetMainDTO2 mainDTO = ActionUtil.getGson().fromJson(mainDTOString, WorksheetMainDTO2.class);
+ return service.productSoftwareSubmit(multipartFile,mainDTO,user);
+ }
+
@GetMapping("statusStatistic")
@ApiOperation("鑾峰彇宸ヤ綔娴�-鍚勮鑹茬敤鎴峰搴旂殑宸ヤ綔鍙版暟鎹垎绫荤粺璁�")
public Response<Map<String,Integer>> getStatusStatistic(){
--
Gitblit v1.9.1