From 95f40a20c7beb789b19256848277c204e3b252e9 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 14:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index e770e6e..6327d9f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -53,7 +53,6 @@
@Resource
private EventGridDataMapper eventGridDataMapper;
-
/**
* 分页查找事件
* @param pageEventDTO
@@ -252,6 +251,10 @@
}else{
eventDO.setGridMemberId(commonEventAddDTO.getUserId());
}
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(commonEventAddDTO.getGridId());
+ if(eventGridDataDO==null){
+ return R.fail("网格不存在");
+ }
eventDO.setEventCategory(1l);//办件事件
eventDO.setEventStatus(2);//事件状态 2发布
eventDO.setProcessType(1);//网格员处理
@@ -316,6 +319,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R saveDraft(CommonEventEditDTO commonEventEditDTO) {
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(commonEventEditDTO.getGridId());
+ if(eventGridDataDO==null){
+ return R.fail("网格不存在");
+ }
if(commonEventEditDTO.getId()==null) {
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(commonEventEditDTO, eventDO);
@@ -687,6 +694,10 @@
@Override
public R saveSpecialDraft(SpecialEventEditDTO specialEventEditDTO) {
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(specialEventEditDTO.getGridId());
+ if(eventGridDataDO==null){
+ return R.fail("网格不存在");
+ }
R rtVal = R.fail();
if(specialEventEditDTO.getId()==null) {
EventDO eventDO = new EventDO();
@@ -820,6 +831,10 @@
@Override
public R addSpecial(SpecialEventAddDTO specialEventAddDTO) {
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(specialEventAddDTO.getGridId());
+ if(eventGridDataDO==null){
+ return R.fail("网格不存在");
+ }
R rtVal = R.fail();
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(specialEventAddDTO, eventDO);
@@ -900,6 +915,10 @@
@Override
public R addPublicity(PublicityEventAddDTO publicityEventAddDTO) {
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(publicityEventAddDTO.getGridId());
+ if(eventGridDataDO==null){
+ return R.fail("网格不存在");
+ }
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(publicityEventAddDTO, eventDO);
eventDO.setGridMemberId(publicityEventAddDTO.getUserId());
@@ -964,6 +983,10 @@
@Override
public R savePublicityDraft(PublicityEventEditDTO publicityEventEditDTO) {
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(publicityEventEditDTO.getGridId());
+ if(eventGridDataDO==null){
+ return R.fail("网格不存在");
+ }
if(publicityEventEditDTO.getId()==null) {
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(publicityEventEditDTO, eventDO);
@@ -1529,4 +1552,9 @@
}
return -1;
}
+
+ @Override
+ public R eventStatistics(Long communityId){
+ return R.ok(this.baseMapper.eventStatistics(communityId));
+ }
}
--
Gitblit v1.7.1