From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
index f09907f..24adbd2 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CategoryCloudController.java
@@ -8,7 +8,9 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Cars;
 import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.model.Company;
 import com.doumee.service.business.CategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -75,11 +77,25 @@
         return ApiResponse.success(categoryService.findPage(pageWrap));
     }
 
+    @ApiOperation("鍒楄〃鏌ヨ")
+    @PostMapping("/list")
+    @CloudRequiredPermission("business:category:query")
+    public ApiResponse<List<Category>> findList (@RequestBody Category category,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        return ApiResponse.success(categoryService.queryList(category));
+    }
+
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:category:exportExcel")
     public void exportExcel (@RequestBody PageWrap<Category> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         ExcelExporter.build(Category.class).export(categoryService.findPage(pageWrap).getRecords(), "鍒嗙被淇℃伅琛�", response);
+    }
+    @ApiOperation("瀵煎嚭浜岀骇鍒嗙被鏁版嵁Excel")
+    @PostMapping("/exportChildExcel")
+    @CloudRequiredPermission("business:category:exportExcel")
+    public void exportChildExcel (@RequestBody PageWrap<Category> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+//        pageWrap.getModel().setType(Constants.ONE);
+        ExcelExporter.build(Category.class).export(categoryService.findChileList(pageWrap.getModel()), "杞﹁締鍒嗙被淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -99,4 +115,6 @@
         category.setType(type);
         return ApiResponse.success(categoryService.findList(category));
     }
+
+
 }

--
Gitblit v1.9.3