From db67d2c23022fed302b8cb07f03076b07ab0941b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 11:16:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 a92eff7..fa653f5 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获取导办事物列表")
+ @PostMapping("/department/getList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) List<String> DepartmentId,
+ @CurrentUser SysUser sysUser)
+ {
+// List<String> ids=iOrganizationChartService.getIds(DepartmentId);
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
+ int num=iTransactionEventService.countNum(null,null,DepartmentId);
+ return getDataTable(list,num);
+ }
+
+ /**
* 导办事物列表(不分页)
* @param
* @return
@@ -164,7 +181,7 @@
Assert.notNull(Id, "Id 不能为空");
int i = iTransactionEventService.deleteConfigById(Id);
if (i>0)
- return toAjax(iTransactionEventService.deleteConfigById(Id));
+ return ResultData.success("删除成功");
else
return ResultData.error("删除失败可能该工单有单据");
}
@@ -303,8 +320,15 @@
{
boolean a = false;
String fileName = file.getOriginalFilename();
- return null;
-
+ Integer b = iTransactionEventService.batchImport(fileName, file);
+ if (b == 3) {//
+ return ResultData.success("全部导入成功");//全部导入成功
+ } else if (b == 2) {
+ return ResultData.success("部分导入成功");//部分导入成功
+ } else if (b == 0) {
+ return ResultData.error("部分失败");//导入失败
+ }
+ return ResultData.error("部分失败");//导入失败
}
--
Gitblit v1.7.1