From 0803e188cc84b0971d13b5746df63ca2418b9236 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 11:16:37 +0800
Subject: [PATCH] 接口整理
---
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
index d0ffd07..221c6ed 100644
--- a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
@@ -1,11 +1,17 @@
package com.doumee.api.business;
+import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.model.WxBillDetail;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
+import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
+import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.GoodsorderService;
import io.swagger.annotations.Api;
@@ -25,7 +31,7 @@
@Api(tags = "璁㈠崟淇℃伅琛�")
@RestController
@RequestMapping("/business/goodsorder")
-public class GoodsorderController {
+public class GoodsorderController extends BaseController {
@Autowired
@@ -69,24 +75,42 @@
return ApiResponse.success(null);
}
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @ApiOperation("璁㈠崟鍒楄〃-鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:goodsorder:query")
public ApiResponse<PageData<Goodsorder>> findPage (@RequestBody PageWrap<Goodsorder> pageWrap) {
return ApiResponse.success(goodsorderService.findPage(pageWrap));
}
+ @ApiOperation("绾夸笂浜ゆ槗姹囨�绘暟鎹帴鍙�")
+ @PostMapping("/getTotalData")
+ @RequiresPermissions("business:goodsorder:query")
+ public ApiResponse<GoodsorderTotalDataVO> getTotalData (@RequestBody Goodsorder pageWrap) {
+ return ApiResponse.success(goodsorderService.getTotalData(pageWrap));
+ }
- @ApiOperation("瀵煎嚭Excel")
+ @ApiOperation("璁㈠崟鍒楄〃-瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:goodsorder:exportExcel")
public void exportExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Goodsorder.class).export(goodsorderService.findPage(pageWrap).getRecords(), "鑷杞︿俊鎭〃", response);
- }
+ ExcelExporter.build(Goodsorder.class).exportWithFirstAndEnd(goodsorderService.findPage(pageWrap).getRecords(), "璁㈠崟鍒楄〃_"+System.currentTimeMillis(),"璁㈠崟鍒楄〃_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+ }
+ @ApiOperation("鏀舵鏄庣粏锛堝井淇″璐︽槑缁嗭級_鍒嗛〉鏌ヨ")
+ @PostMapping("/pageAccountDetail")
+ @RequiresPermissions("business:goodsorder:query")
+ public ApiResponse<PageData<GoodsorderExportVO>> findPageAccountDetail(@RequestBody PageWrap<Goodsorder> pageWrap) {
+ return ApiResponse.success(goodsorderService.findAccountDetailPage(pageWrap));
+ }
+ @ApiOperation("鏀舵鏄庣粏锛堝井淇″璐︽槑缁嗭級_瀵煎嚭Excel")
+ @PostMapping("/exportAccountDetailExcel")
+ @RequiresPermissions("business:goodsorder:exportExcel")
+ public void exportAccountDetailExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(GoodsorderExportVO.class).exportWithFirstAndEnd(goodsorderService.findExportAccountDetailPage(pageWrap.getModel()), "璐﹀崟鏀舵鏄庣粏_"+System.currentTimeMillis(),"璐﹀崟鏀舵鏄庣粏_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:goodsorder:query")
- public ApiResponse findById(@PathVariable String id) {
- return ApiResponse.success(goodsorderService.findById(id));
+ public ApiResponse<GoodsorderDetailDTO> findById(@PathVariable String id) {
+ return ApiResponse.success(goodsorderService.getGoodsorderDetailDTO(id));
}
}
--
Gitblit v1.9.3