ERP_override.git

			@@ -1,6 +1,7 @@
			package com.example.erp.controller.sd;

			import cn.dev33.satoken.annotation.SaCheckPermission;
			import com.alibaba.fastjson.JSONObject;
			import com.example.erp.common.Constants;
			import com.example.erp.common.Result;
			import com.example.erp.dto.sd.OrderDTO;
			@@ -11,6 +12,7 @@
			import com.example.erp.exception.ServiceException;
			import com.example.erp.service.sd.OrderService;
			import com.example.erp.tools.DownExcel;
			import com.fasterxml.jackson.core.JsonProcessingException;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.web.bind.annotation.*;
			@@ -141,12 +143,14 @@

			@SaCheckPermission("orderReport.search")
			@ApiOperation("查询订单报表")
			@PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
			@PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}/{model}/{scope}")
			public Result getOrderReport(@PathVariable Integer pageNum,
			@PathVariable Integer pageSize,
			@PathVariable List<String> selectDate,
			@PathVariable Integer model,//0:精确查找，1：模糊查询
			@PathVariable Integer scope,//模糊范围
			@RequestBody OrderDetail orderDetail) {
			return Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));
			return Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail,model,scope));

			}

			@@ -263,5 +267,20 @@
			return Result.seccess(null);
			}

			@PostMapping("/upload-dxf")
			public Result uploadDxf(@RequestBody Map<String,Object> object) {
			return Result.seccess(orderService.uploadDxf(object));
			}

			@PostMapping("/selectUploadDxf")
			public Result selectUploadDxf(@RequestBody Map<String,Object> object) {
			return Result.seccess(orderService.selectUploadDxf(object));
			}

			@PostMapping("/updateOrderFile")
			public Result updateOrderFile(@RequestBody JSONObject map) throws JsonProcessingException {
			return Result.seccess(orderService.updateOrderFile(map));
			}


			}