From b1d2829ea27d3c8d4e4779d7ee5fe21bfe8f132c Mon Sep 17 00:00:00 2001 From: lxw <810412026@qq.com> Date: 星期四, 11 八月 2022 10:47:42 +0800 Subject: [PATCH] 产品下载excel信息修改 --- src/main/java/com/whyc/controller/WorksheetMainController.java | 83 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 76 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..0fdb9d0 100644 --- a/src/main/java/com/whyc/controller/WorksheetMainController.java +++ b/src/main/java/com/whyc/controller/WorksheetMainController.java @@ -1,5 +1,6 @@ package com.whyc.controller; +import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.dto.WorksheetMainDTO; import com.whyc.pojo.DocUser; @@ -24,9 +25,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 +35,66 @@ } } - @GetMapping("list") - @ApiOperation("鑾峰彇宸ヤ綔娴�-鍚勮鑹茬敤鎴峰搴旂殑宸ヤ綔鍙版暟鎹垎绫�") - public Response getList(){ + @PostMapping("componentRelatedSubmit") + @ApiOperation(value="鏁h浠�-浜у搧瀹℃壒鎻愪氦") + 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,"瑙掕壊鏃犳硶鎻愪氦瀹℃壒"); + } + } + + @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 +104,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