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 | 137 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 126 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index c720047..f58a6c2 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -1,6 +1,9 @@
package com.whyc.controller;
+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;
@@ -9,37 +12,149 @@
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 java.io.IOException;
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) throws IOException {
+ 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("鑾峰彇宸ュ崟娴佺▼-鐢ㄦ埛瀵瑰簲鐨勫緟澶勭悊/宸插鐞�/宸叉彁浜�/宸查┏鍥�")
- public Response getList(){
+ @PostMapping("materialRelatedSubmit")
+ @ApiOperation(value="鐗╂枡-浜у搧瀹℃壒鎻愪氦")
+ public Response materialProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
DocUser user = ActionUtil.getUser();
- Map<String,WorksheetMain> map = service.getList();
- return new Response().set(1,map);
+ boolean res = service.MaterialProductSubmit(mainDTO,user);
+ if(res) {
+ return new Response().set(1,true, "鎻愪氦瀹屾垚");
+ }else{
+ return new Response().set(1,false,"瑙掕壊鏃犳硶鎻愪氦瀹℃壒");
+ }
+ }
+
+ @PostMapping("materialSubmit")
+ @ApiOperation(value="鐗╂枡瀹℃壒鎻愪氦")
+ public Response materialSubmit(@RequestBody WorksheetMain main){
+ Response<Object> response = new Response<>();
+ DocUser user = ActionUtil.getUser();
+ Response res = service.materialSubmit(main,user);
+ if(res.getCode()==1) {
+ response.set(1,true, "鎻愪氦瀹屾垚");
+ }else if(res.getCode()==3){
+ response.set(1,false,"瑙掕壊鏃犳硶鎻愪氦瀹℃壒");
+ }else{
+ //閲嶅鎻愪氦
+ Object existCAList = res.getData();
+ Object existMaterialList = res.getData2();
+ response.setCode(1);
+ response.setData(false);
+ response.setData2(existCAList);
+ response.setData3(existMaterialList);
+ if(res.getCode()==21){
+ response.setMsg("閲嶅鎻愪氦:鐜版湁鐗╂枡鍙婃鍦ㄨ繘琛屽鎵圭殑鐗╂枡涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勬暎瑁呬欢");
+ }else if(res.getCode()==22){
+ response.setMsg("閲嶅鎻愪氦:姝ｅ湪杩涜瀹℃壒鐨勭墿鏂欎腑,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勭墿鏂�");
+ }else{
+ 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(){
+ DocUser user = ActionUtil.getUser();
+ Map<String,Integer> map = service.getStatusStatistic(user);
+ return new Response<Map<String,Integer>>().set(1,map);
+ }
+
+ /*
+ ======寰呭鐞�/宸插鐞�/灞炰簬鑷繁-瀹℃壒涓�/宸查┏鍥�/宸插鎵�======
+
+ //灞炰簬鑷繁-瀹℃壒涓�/宸查┏鍥�/宸插鎵�
+ //寰呭鐞�/宸插鐞�
+ */
+
+ @GetMapping("approvingListPage")
+ @ApiOperation("鏌ョ湅鍒嗛〉-瀹℃壒涓�")
+ public Response<PageInfo<WorksheetMain>> getApprovingListPage(@RequestParam int pageNum,@RequestParam int pageSize){
+ DocUser user = ActionUtil.getUser();
+ return service.getApprovingListPage(user,pageNum,pageSize);
+ }
+
+ @GetMapping("rejectedListPage")
+ @ApiOperation("鏌ョ湅鍒嗛〉-宸查┏鍥�")
+ public Response<PageInfo<WorksheetMain>> getRejectedListPage(@RequestParam int pageNum,@RequestParam int pageSize){
+ DocUser user = ActionUtil.getUser();
+ return service.getRejectedListPage(user,pageNum,pageSize);
+ }
+
+ @GetMapping("approvedListPage")
+ @ApiOperation("鏌ョ湅鍒嗛〉-宸插鎵�")
+ public Response<PageInfo<WorksheetMain>> getApprovedListPage(@RequestParam int pageNum, @RequestParam int pageSize){
+ DocUser user = ActionUtil.getUser();
+ return service.getApprovedListPage(user,pageNum,pageSize);
+ }
+
+ @GetMapping("handlingListPage")
+ @ApiOperation("鏌ョ湅鍒嗛〉-寰呭鐞�")
+ public Response<PageInfo<WorksheetMain>> getHandlingListPage(@RequestParam int pageNum, @RequestParam int pageSize){
+ DocUser user = ActionUtil.getUser();
+ return service.getHandlingListPage(user,pageNum,pageSize);
+ }
+
+ @GetMapping("handledListPage")
+ @ApiOperation("鏌ョ湅鍒嗛〉-宸插鐞�")
+ public Response<PageInfo<WorksheetMain>> getHandledListPage(@RequestParam int pageNum, @RequestParam int pageSize){
+ DocUser user = ActionUtil.getUser();
+ return service.getHandledListPage(user,pageNum,pageSize);
}
@GetMapping("linkInfo")
- @ApiOperation("鑾峰彇宸ュ崟娴佺▼-鍗曚釜宸ュ崟淇℃伅娴�")
+ @ApiOperation("鑾峰彇宸ヤ綔娴�-鍗曚釜瀹℃牳娴佺▼瀹屾暣淇℃伅娴�")
public Response getLinkList(@RequestParam int id){
WorksheetMain main = service.getLinkList(id);
return new Response().set(1,main);
}
+ @PostMapping("info")
+ @ApiOperation("鏌ヨ宸ヤ綔娴佺殑鏍囬鍙婃弿杩�")
+ public Response getInfo(@RequestParam int id){
+ WorksheetMain main = service.getInfo(id);
+ return new Response().set(1,main);
+ }
+
+ @GetMapping("myListPage")
+ @ApiOperation("鎴戠殑宸ュ崟")
+ public Response<PageInfo<WorksheetMain>> getMyList(@RequestParam int pageNum,@RequestParam int pageSize){
+ DocUser user = ActionUtil.getUser();
+ return service.getMyList(pageNum,pageSize,user);
+ }
+
}
--
Gitblit v1.9.1