From 973429e38724c3c15d06b166f02ed3741d060746 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 14:49:25 +0800
Subject: [PATCH] 修改导办人员添加重复问题 bug
---
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 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 438953c..4ae077e 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
@@ -15,6 +15,7 @@
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
@@ -41,7 +42,7 @@
*/
@ApiOperation("查询导办事务详情")
@GetMapping("/getData")
- @Authorization
+
public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser)
{
Assert.notNull(Id, "Id 不能为空");
@@ -58,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)
{
@@ -66,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);
}
@@ -94,6 +95,22 @@
@Authorization
public ResultData insertConfig(@RequestBody TransactionEvent entity)
{
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getMatterName()))
+ {
+ return ResultData.error("事件名称不能为空");
+ }
+
+ String id=iTransactionEventService.selectDataIfExist(entity.getDepartmentId(),entity.getMatterName());
+ if(!StringUtils.isEmpty(id))
+ {
+ return ResultData.error("事件名称已存在");
+ }
+
return toAjax(iTransactionEventService.insertConfig(entity));
}
@@ -107,6 +124,18 @@
@Authorization
public ResultData updateConfig(@RequestBody TransactionEvent entity)
{
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空");
+ }
+
+ if(StringUtils.isEmpty(entity.getMatterName()))
+ {
+ return ResultData.error("事件名称不能为空");
+ }
+
+
+
return toAjax(iTransactionEventService.updateConfig(entity));
}
@@ -132,7 +161,6 @@
*/
@ApiOperation(value = "导办事务搜索",response = QueryResults.class)
@GetMapping("/queryKeyWordList")
- @Authorization
public QueryResults queryMatterNameList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
@RequestParam(value = "recommendSize",required = false) Integer recommendSize,
@@ -207,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