From 9695412e47d3f1a668bd8827edd32f0a46a321e5 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 08 六月 2021 13:50:27 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 c1a6072..fc697eb 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
@@ -1838,6 +1838,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R reportDirect(CommonEventDirectReportDTO commonEventDirectReportDTO) {
if(commonEventDirectReportDTO.getEventId()!=null){
@@ -1850,10 +1851,9 @@
eventDO.setGridMemberId(commonEventDirectReportDTO.getUserId());
eventDO.setEventCategory(1l);//办件事件
eventDO.setEventStatus(1);//事件状态 2发布
- eventDO.setProcessType(1);//网格员处理
- eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setProcessType(2);//社区处理
+ eventDO.setCommunityProcess(1);// 社区处理
eventDO.setUpdateBy(commonEventDirectReportDTO.getUserId());
- eventDO.setEventDealStatus(5);
if (eventMapper.updateById(eventDO) > 0) {
int deleted = eventResourceService.getBaseMapper()
.delete(new LambdaQueryWrapper<EventResourceDO>()
@@ -1938,8 +1938,8 @@
}
eventDO.setEventCategory(1l);//办件事件
eventDO.setEventStatus(2);//事件状态 2发布
- eventDO.setProcessType(1);//网格员处理
- eventDO.setCommunityProcess(0);//非 社区处理
+ eventDO.setProcessType(2);//社区处理
+ eventDO.setCommunityProcess(1);//社区处理
eventDO.setEventProcessStatus(1);
eventDO.setGridMemberName(commonEventDirectReportDTO.getUserName());
eventDO.setGridMemberTelephone(commonEventDirectReportDTO.getPhone());
@@ -2001,7 +2001,7 @@
if (comActVO == null) {
return R.fail("社区不存在");
}
- EventDO eventDOInDB = this.getBaseMapper().selectById(commonEventDirectReportDTO.getEventId());
+ EventDO eventDOInDB = this.getBaseMapper().selectById(eventDO.getId());
eventDOInDB.setCommunityProcess(1); //社区处理
eventDOInDB.setProcessType(2); //当前处理对象： 社区处理
eventDOInDB.setCommunityProcess(1);
@@ -2014,7 +2014,7 @@
}
addTransferRecord(eventDO.getId(), commonEventDirectReportDTO.getToId(), comActVO.getName(), 2, commonEventDirectReportDTO.getProcessResult(),
commonEventDirectReportDTO.getUserId(), commonEventDirectReportDTO.getUserName(), 2);
- return R.ok();
+ return R.ok(eventDO.getId());
}
}
--
Gitblit v1.7.1