From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 c231cc9..07e7905 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
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
import org.springframework.beans.BeanUtils;
@@ -1299,7 +1300,7 @@
@Override
public R<ComActVO> actList() {
- return communityService.listCommunityAll();
+ return communityService.listCommunityAll(null);
}
@Override
@@ -1380,10 +1381,11 @@
} else {
return R.fail("事件所属错误");
}
- eventDO.setInvalid(false);
+// eventDO.setInvalid(false);
// 标为无效后， 交给网格员处理
eventDO.setUpdateBy(eventRevokeDTO.getUserId());
eventDO.setEventStatus(4);// 4、撤销
+ eventDO.setEventDealStatus(6);// 4、撤销
eventDO.setProcessType(1);// 网格员处理
eventDO.setCommunityProcess(0);// 非 社区处理
eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
@@ -1403,11 +1405,13 @@
if (eventDO == null) {
return R.fail("事件不存在");
}
- boolean canRepulish = eventDO.getEventDealStatus() == 7 | eventDO.getEventDealStatus() == 5; // 已失效状态
+ boolean canRepulish = eventDO.getEventDealStatus() == 7 || eventDO.getEventDealStatus() == 5 || eventDO.getEventDealStatus() == 6; // 已失效状态
if (!canRepulish) {
- return R.fail("当前事件不是已失效状态/草稿状态，不能重新发布");
+ return R.fail("当前事件不是已失效状态/草稿状态/撤销状态，不能重新发布");
}
eventDO.setInvalid(true);
+ eventDO.setEventStatus(2);
+ eventDO.setEventDealStatus(1);
int updated = this.getBaseMapper().updateById(eventDO);
if (updated == 1) {
addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(),
@@ -2667,7 +2671,6 @@
}
});
}
- statisticsVO.setGridIncidentList(eventResultList);
// 查询所有小区
List<CivilVillageStatisticsVO> villageStatisticsList =
this.baseMapper.getCivilScreenVillageList(eventListDTO.getCommunityId());
@@ -2832,4 +2835,15 @@
statisticsVO.setDrawEventPopulationTotalVO(populationTotalVO);
return R.ok(statisticsVO);
}
+
+ /**
+ * 西区大数据分析平台-综合治理栏
+ * @return
+ */
+ @Override
+ public R getComprehensiveGovernanceStatics() {
+ EventComprehensiveGovernanceStatisticsVO governanceStatisticsVO = this.baseMapper.selectComprehensiveGovernanceStatics();
+ governanceStatisticsVO.generateGovernanceTotal();
+ return R.ok(governanceStatisticsVO);
+ }
}
--
Gitblit v1.7.1