ERP_override.git

			@@ -7,8 +7,12 @@
			import io.swagger.annotations.ApiOperation;
			import lombok.RequiredArgsConstructor;
			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 java.time.LocalDate;
			import java.util.List;

			@RestController
			@RequestMapping("/app")
			@@ -19,7 +23,7 @@

			@ApiOperation("订单报表")
			@PostMapping("/getOrderList")
			public Result getOrderList() {
			return Result.success(orderService.appGetOrderList());
			public Result getOrderList(@RequestBody List<LocalDate> dates) {
			return Result.success(orderService.appGetOrderList(dates));
			}
			}

			@@ -1023,4 +1023,27 @@
			}
			return true;
			}

			public Map<String,Object> appGetOrderList(List<LocalDate> dates) {
			String endDate = LocalDate.now().toString();
			String startDate = LocalDate.now().minusDays(30).toString();
			if(dates !=null && dates.size()==2){
			if(dates.get(0) != null){
			startDate = String.valueOf(dates.get(0));
			}
			if(dates.get(1) != null){
			endDate = String.valueOf(dates.get(1));
			}
			}
			List<Order> list = orderMapper.selectList(new LambdaQueryWrapper<Order>()
			.gt(Order::getCreateOrder,0)
			.between(Order::getCreateTime,startDate, endDate)
			);

			Map<String,Object> map = new HashMap<>();
			map.put("data",list);

			return map;
			//return orderMapper.
			}
			}

	north-glass-erp/src/main/java/com/example/erp/controller/AppController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史