From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
index 9348958..470680f 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ClassifyAdministrationController.java
@@ -5,6 +5,7 @@
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.ClassifyAdministration;
+import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IClassifyAdministrationService;
import com.dg.core.service.ITransactionEventService;
@@ -16,6 +17,7 @@
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
@@ -75,13 +77,14 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "name",required = false) String name)
+ @RequestParam(value = "name",required = false) String name,
+ @RequestParam(value = "classifyGrade",required = false) String classifyGrade)
{
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<ClassifyAdministration> pageParam = new Page<>(pageNum,pageSize);
- List<ClassifyAdministration> list = iClassifyAdministrationService.selectConfigList(pageParam,pageSize,name,"");
- int num=iClassifyAdministrationService.countNum(name,"");
+ List<ClassifyAdministration> list = iClassifyAdministrationService.selectConfigList(pageParam,pageSize,name,classifyGrade);
+ int num=iClassifyAdministrationService.countNum(name,classifyGrade);
return getDataTable(list,num);
}
@@ -167,8 +170,22 @@
+ /**
+ * 树状分类选择列表
+ * @return
+ */
+ @ApiOperation("树状分类选择列表")
+ @GetMapping("/getClassifyList")
+ public TableDataInfo getClassifyList()
+ {
+ List<ClassifyAdministration> list=iClassifyAdministrationService.selectConfigList("","1");
-
+ for(ClassifyAdministration entity:list)
+ {
+ entity.setClassifyAdministrationEntityList(iClassifyAdministrationService.selectParentData(entity.getId()+""));
+ }
+ return getDataTable(list);
+ }
--
Gitblit v1.7.1