From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001 From: chenlu <1320612696@qq.com> Date: 星期五, 07 六月 2024 16:56:06 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 154 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 141 insertions(+), 13 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java index 1386624..0db09e2 100644 --- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java +++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java @@ -1,27 +1,155 @@ package com.example.erp.controller.sd; -import cn.hutool.json.JSON; -import com.alibaba.fastjson.JSONObject; +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.example.erp.common.Constants; import com.example.erp.common.Result; +import com.example.erp.dto.sd.OrderDTO; import com.example.erp.entity.sd.Order; +import com.example.erp.entity.sd.OrderDetail; +import com.example.erp.entity.sd.OrderGlassDetail; +import com.example.erp.exception.ServiceException; import com.example.erp.service.sd.OrderService; -import org.apache.tomcat.Jar; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.example.erp.tools.DownExcel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.LocalDate; +import java.util.List; import java.util.Map; @RestController @RequestMapping("/order") +@Api(value="璁㈠崟controller",tags={"璁㈠崟鎿嶄綔鎺ュ彛"}) public class OrderController { - @Autowired - private OrderService orderService; + private final OrderService orderService; - @PostMapping("/saveOrder") - public Result saveOrder(@RequestBody Map<String, Object> orderMap) { - return Result.seccess(orderService.saveOrder(orderMap)); + public OrderController(OrderService orderService) { + this.orderService = orderService; } + + + @ApiOperation("璁㈠崟淇濆瓨") + @PostMapping("/saveOrder") + @SaCheckPermission("createOrder.add") + public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception { + if(orderService.saveOrder(orderMap)) { + return Result.seccess(true); + }else{ + throw new ServiceException(Constants.Code_500,Constants.Code_msg); + } + } + @ApiOperation("璁㈠崟鍒嗛〉绛涢�夋煡璇�") + @SaCheckPermission("selectOrder.search") + @PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}") + public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Order order) { + return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType)); + } + @ApiOperation("鍒犻櫎璁㈠崟") + @SaCheckPermission("selectOrder.delete") + @PostMapping("/deleteOrder/{id}") + public Result deleteOrder(@PathVariable String id) { + return Result.seccess(orderService.deleteOrder(id)); + } + + @ApiOperation("璁㈠崟浣滃簾") + @SaCheckPermission("createOrder.cancel") + @PostMapping("/cancelOrder/{id}") + public Result cancelOrder(@PathVariable String id) { + return Result.seccess(orderService.cancelOrder(id)); + } + + @ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅") + @PostMapping("/getOrderById/{id}") + public Result getOrderById(@PathVariable String id) { + return Result.seccess(orderService.getOrderById(id)); + } + + @ApiOperation("鏍规嵁id鑾峰彇璁㈠崟鏄庣粏淇℃伅") + @SaCheckPermission("selectOrder.edit") + @PostMapping("/getOrderDetailById/{id}") + public Result getOrderDetailById(@PathVariable String id) { + return Result.seccess(orderService.getOrderDetailById(id)); + } + + + + + @ApiOperation("鏌ヨ璁㈠崟宸ヨ壓") + @SaCheckPermission("updateOrderCraft.search") + @PostMapping("/getOrderCraftById/{id}") + public Result getOrderCraftById(@PathVariable String id) { + return Result.seccess(orderService.getOrderCraftById(id)); + } + + @PostMapping("/getOrderCraftDetailById/{id}") + public Result getOrderCraftDetailById(@PathVariable String id) { + return Result.seccess(orderService.getOrderCraftDetailById(id)); + } + @ApiOperation("瀹℃牳璁㈠崟") + @SaCheckPermission("createOrder.review") + @PostMapping("/reviewOrderById/{id}/{status}") + public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) { + return Result.seccess(orderService.reviewOrderById(id,status)); + } + + @ApiOperation("瀹℃牳宸ヨ壓") + @SaCheckPermission("updateOrderCraft.review") + @PostMapping("/reviewProcessById/{id}/{status}") + public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails) { + return Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails)); + } + + @ApiOperation("鏇存柊璁㈠崟閲戦鍗曚环") + @SaCheckPermission("createOrder.amountReset") + @PostMapping("/updateOrderMoney") + public Result updateOrderMoney(@RequestBody Map<String,Object> map) { + return Result.seccess(orderService.updateOrderMoney(map)); + } + + @SaCheckPermission("orderReport.search") + @ApiOperation("鏌ヨ璁㈠崟鎶ヨ〃") + @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}") + public Result getOrderReport(@PathVariable Integer pageNum, + @PathVariable Integer pageSize, + @PathVariable List<String> selectDate, + @RequestBody OrderDetail orderDetail) { + return Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail)); + + } + + //@SaCheckPermission("orderProductSummary.search") + @ApiOperation("鏌ヨ璁㈠崟浜у搧姹囨�绘姤琛�") + @PostMapping("/getOrderProductSummary/{pageNum}/{pageSize}/{selectDate}") + public Result getOrderProductSummary(@PathVariable Integer pageNum, + @PathVariable Integer pageSize, + @PathVariable List<String> selectDate, + @RequestBody OrderDetail orderDetail) { + return Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail)); + + } + @ApiOperation("璁㈠崟鎶ヨ〃瀵煎嚭") + @PostMapping("/exportOrderReport") + public void exportOrderReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException { + + //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧 + DownExcel.download(response, OrderDTO.class, orderService.exportOrderReport(dates),"orderReport"); + } + + @ApiOperation("璁㈠崟浜у搧姹囨�绘姤琛ㄥ鍑�") + @PostMapping("/exportOrderProductSummary") + public void exportOrderProductSummary(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException { + //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧 + DownExcel.download(response, OrderDTO.class, orderService.exportOrderProductSummary(dates),"orderReport"); + } + + @ApiOperation("璁㈠崟灏忕墖鏍囩") + @PostMapping("/getOrderProductDetailTag/{orderId}") + public Result getOrderProductDetailTag(@PathVariable String orderId) { + return Result.seccess(orderService.getOrderProductDetailTag(orderId)); + } + + } -- Gitblit v1.8.0