From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 fa653f5..f58bfe8 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;
/**
* 查询导办事务详情
@@ -72,15 +78,25 @@
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "keyword",required = false) String keyword,
@RequestParam(value = "classifyGrade",required = false) String classifyGrade,
+ @RequestParam(value = "departmentId",required = false) String departmentId,
@CurrentUser SysUser sysUser)
{
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
-// List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
- List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
+ List<TransactionEvent> list;
+ int num;
+ if (departmentId!=null&&departmentId.length()>0){
+ List<String> ids=iOrganizationChartService.getDepartmentId(departmentId);
+ list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
+ classifyGrade,ids);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
+
+ }else {
+ list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
classifyGrade,null);
- int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
+ num=iTransactionEventService.countNum(keyword,classifyGrade,null);
+ }
return getDataTable(list,num);
}
@@ -92,10 +108,13 @@
@ApiOperation("根据部门id获取导办事物列表")
@PostMapping("/department/getList")
@Authorization
- public TableDataInfo<TransactionEvent> selectConfigList(@RequestParam(value = "DepartmentId",required = false) List<String> DepartmentId,
+ public TableDataInfo<TransactionEvent> selectConfigList(@RequestBody List<String> DepartmentId,
@CurrentUser SysUser sysUser)
{
-// List<String> ids=iOrganizationChartService.getIds(DepartmentId);
+ if(DepartmentId==null||DepartmentId.size()<1)
+ {
+ DepartmentId=null;
+ }
List<TransactionEvent> list = iTransactionEventService.selectConfigList(null,null,DepartmentId);
int num=iTransactionEventService.countNum(null,null,DepartmentId);
return getDataTable(list,num);
@@ -219,7 +238,7 @@
@GetMapping("/queryByClassifyIdConfigList")
public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam("classifyId") String classifyId,
+ @RequestParam(value = "classifyId",required = false) String classifyId,
@RequestParam(required = false,name="departmentId") Integer departmentId){
Assert.notNull(pageNum, "pageNum 不能为空");
Assert.notNull(pageSize, "pageSize 不能为空");
@@ -265,7 +284,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);
}
@@ -320,7 +346,7 @@
{
boolean a = false;
String fileName = file.getOriginalFilename();
- Integer b = iTransactionEventService.batchImport(fileName, file);
+ Integer b = iTransactionEventService.batchImport(fileName, file);
if (b == 3) {//
return ResultData.success("全部导入成功");//全部导入成功
} else if (b == 2) {
--
Gitblit v1.7.1