From bd927f5c9f26d5ae89a272e56a4b3bd655bd148f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:19:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 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 5987441..f44ee1d 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
@@ -59,7 +59,7 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "matterAndUser",required = false) String matterAndUser,
+ @RequestParam(value = "keyword",required = false) String keyword,
@RequestParam(value = "classifyGrade",required = false) String classifyGrade,
@CurrentUser SysUser sysUser)
{
@@ -67,9 +67,9 @@
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,matterAndUser,
+ List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
classifyGrade,ids);
- int num=iTransactionEventService.countNum(matterAndUser,classifyGrade,ids);
+ int num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
return getDataTable(list,num);
}
@@ -80,9 +80,9 @@
*/
@ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
@GetMapping("/selectList")
- public TableDataInfo selectList()
+ public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
{
- return getDataTable(iTransactionEventService.selectList());
+ return getDataTable(iTransactionEventService.selectList(keyWord));
}
/**
@@ -134,11 +134,7 @@
return ResultData.error("事件名称不能为空");
}
- String id=iTransactionEventService.selectDataIfExist(entity.getDepartmentId(),entity.getMatterName());
- if(!StringUtils.isEmpty(id))
- {
- return ResultData.error("事件名称已存在");
- }
+
return toAjax(iTransactionEventService.updateConfig(entity));
}
@@ -239,7 +235,35 @@
@GetMapping("/smartConsulting")
public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
return iTransactionEventService.smartConsulting(keyWord);
-
}
+
+ /**
+ * 办事指南复制
+ * @return
+ */
+ @ApiOperation(value = "办事指南复制",response = ResultData.class)
+ @GetMapping("/copy")
+ public ResultData copy(@RequestParam("Id") String Id)
+ {
+ if(StringUtils.isEmpty(Id))
+ {
+ return ResultData.error("Id不能为空");
+ }
+
+ TransactionEvent transactionEvent=iTransactionEventService.selectConfigData(Id,null);
+ if(transactionEvent==null)
+ {
+ return ResultData.error("复制项不存在");
+ }
+ transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");
+
+ transactionEvent.setId(null);
+ return toAjax(iTransactionEventService.insertConfig(transactionEvent));
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1