From 878500afec6c7daa644b9573fd56e9903cf5d39f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 13 十月 2022 13:51:39 +0800
Subject: [PATCH] 修改添加办事指南，名称需要做判重bug
---
flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java | 6 +-
flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java | 6 ++
flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java | 6 ++
flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml | 13 ++++
flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java | 7 -
flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java | 6 +
flower_city/src/main/resources/mapper/TransactionEventMapper.xml | 38 +++++-------
flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java | 5 +
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 33 +++++++++++
flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java | 5 +
10 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
index 3bd0c5e..2c2b017 100644
--- a/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/HomeStatisticsController.java
@@ -33,9 +33,6 @@
IClassifyAdministrationService iClassifyAdministrationService;
@Autowired
- ITransactionEventService iTransactionEventService;
-
- @Autowired
HomeStatisticsService homeStatisticsService;
@@ -172,7 +169,7 @@
{
PieChartAll pieChartAll=new PieChartAll();
pieChartAll.setWorkOrderNum(iGuideRepairOrderService.countStatisticsNum("",null,null,null,null,null)+"");
- pieChartAll.setFingerpostNum(iTransactionEventService.countStatisticsNum(null)+"");
+ pieChartAll.setFingerpostNum(homeStatisticsService.countStatisticsNum(null)+"");
List<PieChart> workOrderList=new ArrayList<>();
List<PieChart> fingerpostList=new ArrayList<>();
List<ClassifyAdministration> oneIds=iClassifyAdministrationService.getClassify(null,"1");
@@ -196,7 +193,7 @@
if(clasIds.size()>0)
{
workOrderNum=iGuideRepairOrderService.countStatisticsNum(null,null,null,null,null,clasIds);
- fingerpostNum=iTransactionEventService.countStatisticsNum(clasIds);
+ fingerpostNum=homeStatisticsService.countStatisticsNum(clasIds);
}
workOrder.setNum(workOrderNum+"");
fingerpost.setNum(fingerpostNum+"");
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 d4d795e..5987441 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.*;
@@ -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,22 @@
@Authorization
public ResultData updateConfig(@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.updateConfig(entity));
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
index fbaac79..41e42dc 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HomeStatisticsMapper.java
@@ -68,4 +68,10 @@
* @return
*/
List<Guidance> guidanceBrowse();
+
+ /**
+ * 获取统计数据 首页用 勿动
+ */
+ int countStatisticsNum(List<String> classifyIds);
+
}
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
index 7d4c8e6..2dd3e6f 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java
@@ -159,11 +159,11 @@
*/
List<TransactionEvent> selectListByIds(String[] list);
-
/**
- * 获取统计数据 首页用 勿动
+ * 根据部门判断是否有事项名称重复
*/
- int countStatisticsNum(List<String> classifyIds);
+ String selectDataIfExist(@Param("departmentId") String departmentId,
+ @Param("matterName") String matterName);
diff --git a/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java b/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
index 05ba5ab..ef2a4dc 100644
--- a/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
+++ b/flower_city/src/main/java/com/dg/core/service/HomeStatisticsService.java
@@ -66,4 +66,9 @@
* @return
*/
Integer countWork();
+
+ /**
+ * 获取统计数据 首页用 勿动
+ */
+ int countStatisticsNum(List<String> classifyIds);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
index 0c36de8..59e9548 100644
--- a/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java
@@ -6,6 +6,7 @@
import com.dg.core.db.manual.pojo.QueryResults;
import com.dg.core.db.manual.pojo.RecommendResult;
import com.dg.core.db.manual.pojo.Search;
+import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -124,8 +125,9 @@
/**
- * 获取统计数据 首页用 勿动
+ * 根据部门判断是否有事项名称重复
*/
- int countStatisticsNum(List<String> classifyIds);
+ String selectDataIfExist(@Param("departmentId") String departmentId,
+ @Param("matterName") String matterName);
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
index 8980cbb..3fd9762 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
@@ -64,4 +64,10 @@
return baseMapper.countWork();
}
+ @Override
+ public int countStatisticsNum(List<String> classifyIds) {
+ return baseMapper.countStatisticsNum(classifyIds);
+ }
+
+
}
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
index 1da4883..56fdd6c 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java
@@ -136,10 +136,11 @@
}
@Override
- public int countStatisticsNum(List<String> classifyIds) {
- return baseMapper.countStatisticsNum(classifyIds);
+ public String selectDataIfExist(String departmentId, String matterName) {
+ return baseMapper.selectDataIfExist(departmentId,matterName);
}
+
@Override
public int countNumByMatterName(String matterName) {
return baseMapper.countNumByMatterName(matterName);
diff --git a/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml b/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
index ffacd09..e8e2439 100644
--- a/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
+++ b/flower_city/src/main/resources/mapper/HomeStatisticsMapper.xml
@@ -97,7 +97,18 @@
-
+ <!-- 首页统计 勿动 -->
+ <select id="countStatisticsNum" resultType="integer">
+ select count(id) from automessage_transaction_event
+ <where>
+ <if test="classifyIds != null">
+ and classify_id IN
+ <foreach collection="classifyIds" item="param" open="(" close=")" separator=",">
+ #{param}
+ </foreach>
+ </if>
+ </where>
+ </select>
diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index ec0932f..ae16c89 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -347,12 +347,12 @@
<select id="selectSearch" resultType="com.dg.core.db.manual.pojo.Search">
select id,title,content,views, type FROM(
- select id,organization_name title,resume content,null views,1 type from automessage_organization_chart UNION
- select id,matter_name title,concat((select classify_name from automessage_classify_administration
- where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
- '>',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,
- transaction_num views,2 type from automessage_transaction_event
- ) k
+ select id,organization_name title,resume content,null views,1 type from automessage_organization_chart UNION
+ select id,matter_name title,concat((select classify_name from automessage_classify_administration
+ where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
+ '>',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,
+ transaction_num views,2 type from automessage_transaction_event
+ ) k
where k.title like concat('%',#{keyWord}, '%') or k.content like concat('%', #{keyWord}, '%')
</select>
@@ -366,27 +366,19 @@
</select>
<select id="selectSearchAssociate" resultType="com.dg.core.db.manual.pojo.Search">
- select id,matter_name title,concat((select classify_name from automessage_classify_administration
- where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
- '>',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,
- transaction_num views ,3 type from automessage_transaction_event where associate_names like concat('%',#{keyWord}, '%')
+ select id,matter_name title,concat((select classify_name from automessage_classify_administration
+ where id=(select parent_id from automessage_classify_administration where id=automessage_transaction_event.classify_id)),
+ '>',(select classify_name from automessage_classify_administration where id=automessage_transaction_event.classify_id)) content,
+ transaction_num views ,3 type from automessage_transaction_event where associate_names like concat('%',#{keyWord}, '%')
</select>
- <!-- 首页统计 勿动 -->
- <select id="countStatisticsNum" resultType="integer">
- select count(id) from automessage_transaction_event
- <where>
- <if test="classifyIds != null">
- and classify_id IN
- <foreach collection="classifyIds" item="param" open="(" close=")" separator=",">
- #{param}
- </foreach>
- </if>
- </where>
+
+ <select id="selectDataIfExist" resultType="string">
+ select id from automessage_transaction_event
+ where department_id=#{departmentId}
+ and matter_name=#{matterName}
</select>
-
-
</mapper>
--
Gitblit v1.7.1