From 6f43bb7c91ed559691f78d178ee94fceb68f4cb1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 15 十一月 2022 15:12:05 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 1 +
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
index 4373024..22a806a 100644
--- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -85,6 +85,23 @@
}
/**
+ * 导办事物列表
+ * @param
+ * @return
+ */
+ @ApiOperation("根据部门id获取导办事物列表")
+ @GetMapping("/department/getList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) String DepartmentId,
+ @CurrentUser SysUser sysUser)
+ {
+ List<String> ids=iOrganizationChartService.getIds(DepartmentId);
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,ids);
+ int num=iTransactionEventService.countNum(null,null,ids);
+ return getDataTable(list,num);
+ }
+
+ /**
* 导办事物列表(不分页)
* @param
* @return
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
index 8d57068..02a63e6 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
@@ -30,6 +30,7 @@
+
/**
* 导办事物列表 (部分也)
* @param
--
Gitblit v1.7.1