Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportIncomingController.java

@@ -8,9 +8,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -22,32 +20,32 @@ public class ReportIncomingController extends BladeController {
 
 	private final IReportIncomingService reportIncomingService;
 
-	@GetMapping("/deptIncomingPage")
+	@PostMapping("/deptIncomingPage")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "营业部收入报表", notes = "营业部收入报表")
-	public R deptIncomingPage(ReportIncomingDTO reportIncomingDTO) {
+	public R deptIncomingPage(@RequestBody ReportIncomingDTO reportIncomingDTO) {
 		return reportIncomingService.deptIncomingPage(reportIncomingDTO);
 	}
 
-	@GetMapping("/deptIncomingExport")
+	@PostMapping("/deptIncomingExport")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "营业部收入报表导出", notes = "营业部收入报表导出")
-	public void deptIncomingExport(ReportIncomingDTO reportIncomingDTO, HttpServletResponse response) {
+	public void deptIncomingExport(@RequestBody ReportIncomingDTO reportIncomingDTO, HttpServletResponse response) {
 		reportIncomingService.deptIncomingExport(reportIncomingDTO,response);
 	}
 
 
-	@GetMapping("/consigineeIncomingPage")
+	@PostMapping("/consigineeIncomingPage")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "收货单位收入报表", notes = "收货单位收入报表")
-	public R consigineeIncomingPage(ReportIncomingDTO reportIncomingDTO) {
+	public R consigineeIncomingPage(@RequestBody ReportIncomingDTO reportIncomingDTO) {
 		return reportIncomingService.consigineeIncomingPage(reportIncomingDTO);
 	}
 
-	@GetMapping("/consigineeIncomingExport")
+	@PostMapping("/consigineeIncomingExport")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "收货单位收入报表导出", notes = "收货单位收入报表导出")
-	public void consigineeIncomingExport(ReportIncomingDTO reportIncomingDTO, HttpServletResponse response) {
+	public void consigineeIncomingExport(@RequestBody ReportIncomingDTO reportIncomingDTO, HttpServletResponse response) {
 		reportIncomingService.consigineeIncomingExport(reportIncomingDTO,response);
 	}