From 29d225bd574c069a4a918de3d3072d7c7d58fd44 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 17 八月 2022 17:04:54 +0800
Subject: [PATCH] 根据物料编码查询所有包含该物料的产品信息
---
src/main/java/com/whyc/controller/WorksheetMainController.java | 125 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 118 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index 3167b58..44e6e8b 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -1,7 +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;
@@ -10,7 +12,11 @@
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 javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -24,9 +30,9 @@
@PostMapping("submit")
@ApiOperation("浜у搧鍥剧焊鍙奲om鎻愪氦")
- public Response submit(@RequestBody WorksheetMainDTO mainDTO){
+ public Response submit(@RequestBody WorksheetMain main){
DocUser user = ActionUtil.getUser();
- boolean res = service.submit(mainDTO,user);
+ boolean res = service.submit(main,user);
if(res) {
return new Response().set(1,true, "鎻愪氦瀹屾垚");
}else{
@@ -34,12 +40,103 @@
}
}
- @GetMapping("list")
- @ApiOperation("鑾峰彇宸ヤ綔娴�-鍚勮鑹茬敤鎴峰搴旂殑宸ヤ綔鍙版暟鎹垎绫�")
- public Response getList(){
+ @PostMapping("componentRelatedSubmit")
+ @ApiOperation(value="鏁ｈ浠�-浜у搧瀹℃壒鎻愪氦")
+ public Response componentProductSubmit(@RequestBody WorksheetMainDTO mainDTO){
DocUser user = ActionUtil.getUser();
- Map<String,List<WorksheetMain>> map = service.getList(user);
- return new Response().set(1,map);
+ boolean res = service.componentProductSubmit(mainDTO,user);
+ if(res) {
+ return new Response().set(1,true, "鎻愪氦瀹屾垚");
+ }else{
+ return new Response().set(1,false,"瑙掕壊鏃犳硶鎻愪氦瀹℃壒");
+ }
+ }
+
+ @PostMapping("componentSubmit")
+ @ApiOperation(value="鏁ｈ浠跺鎵规彁浜�")
+ public Response componentSubmit(@RequestBody WorksheetMain main){
+ Response<Object> response = new Response<>();
+ DocUser user = ActionUtil.getUser();
+ Response res = service.componentSubmit(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 existComponentList = res.getData2();
+ response.setCode(1);
+ response.setData(false);
+ response.setData2(existCAList);
+ response.setData3(existComponentList);
+ 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")
@@ -49,4 +146,18 @@
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