From 65e918de84f0798f208d4a8222393623e890d556 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 03 二月 2024 13:27:09 +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 | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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..4df00c7 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,38 @@
package com.example.erp.controller.sd;
-import cn.hutool.json.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Order;
+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 org.springframework.web.bind.annotation.*;
+import java.time.LocalDate;
+import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/order")
public class OrderController {
- @Autowired
- private OrderService orderService;
+ private final OrderService orderService;
+
+ public OrderController(OrderService orderService) {
+ this.orderService = orderService;
+ }
+
@PostMapping("/saveOrder")
- public Result saveOrder(@RequestBody Map<String, Object> orderMap) {
- return Result.seccess(orderService.saveOrder(orderMap));
+ 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);
+ }
+ }
+
+ @PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
+ public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<LocalDate> selectDate, @RequestBody Order order) {
+ return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
}
}
--
Gitblit v1.8.0