From 7d98f48d82a5b2d0b4c42ea412fa160e41e3be9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 10:54: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 | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 2a7c7c6..96f601b 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
@@ -5,6 +5,7 @@
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.AjaxResult;
+import com.dg.core.db.gen.entity.AutomessageSmartConsulting;
import com.dg.core.db.gen.entity.Slideshow;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.gen.entity.TransactionEvent;
@@ -14,6 +15,7 @@
import com.dg.core.file.FtpConstants;
import com.dg.core.file.MimeTypeUtils;
import com.dg.core.file.SFTPUtil;
+import com.dg.core.service.IAutomessageSmartConsultingService;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
@@ -27,6 +29,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.InputStream;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -45,6 +48,9 @@
@Autowired(required = true)
IOrganizationChartService iOrganizationChartService;
+
+ @Autowired(required = true)
+ IAutomessageSmartConsultingService iAutomessageSmartConsultingService;
/**
* 查询导办事务详情
@@ -81,6 +87,23 @@
List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
classifyGrade,null);
int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
+ return getDataTable(list,num);
+ }
+
+ /**
+ * 导办事物列表
+ * @param
+ * @return
+ */
+ @ApiOperation("根据部门id获取导办事物列表")
+ @PostMapping("/department/getList")
+ @Authorization
+ public TableDataInfo<TransactionEvent> selectConfigList(@RequestBody 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);
}
@@ -248,7 +271,14 @@
*/
@ApiOperation(value = "智能咨询",response = RecommendResult.class)
@GetMapping("/smartConsulting")
- public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
+ public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord,@CurrentUser SysUser sysUser){
+ AutomessageSmartConsulting automessageSmartConsulting = new AutomessageSmartConsulting();
+ if (sysUser!=null){
+ automessageSmartConsulting.setCreateUserId(sysUser.getUserId());
+ }
+ automessageSmartConsulting.setType(2);
+ automessageSmartConsulting.setCreateTime(LocalDateTime.now());
+ iAutomessageSmartConsultingService.add(automessageSmartConsulting);
return iTransactionEventService.smartConsulting(keyWord);
}
@@ -303,11 +333,15 @@
{
boolean a = false;
String fileName = file.getOriginalFilename();
- boolean b = iTransactionEventService.batchImport(fileName, file);
- if (b){
- return ResultData.success("导入成功");
+ 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("导入失败");
+ return ResultData.error("部分失败");//导入失败
}
--
Gitblit v1.7.1