From ede1ecbc02500c534fc884cc5b62c4de0a5f18f1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 十月 2021 16:50:45 +0800
Subject: [PATCH] 实有房屋数据修复任务
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 c3920a7..48cf622 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
@@ -317,7 +317,9 @@
if (eventMapper.insert(eventDO) == 1) {
// 如果是特殊人群，则新增特殊人群与事件关系
- if (commonEventAddDTO.getEventType().equals(6)) {
+ if (commonEventAddDTO.getEventType().equals(6)
+ && commonEventAddDTO.getPopulationIds() != null
+ && commonEventAddDTO.getPopulationIds().size() > 0) {
if (commonEventAddDTO.getPopulationIds() != null && commonEventAddDTO.getPopulationIds().size() > 0) {
List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>();
commonEventAddDTO.getPopulationIds().forEach(populationId -> {
@@ -397,11 +399,11 @@
if (commonEventEditDTO.getId() == null) {
// 检查特殊人群上报时参数
- if (commonEventEditDTO.getEventType().equals(6)) {
- if (commonEventEditDTO.getPopulationIds().isEmpty()) {
- return R.fail("上报人员为空");
- }
- }
+// if (commonEventEditDTO.getEventType().equals(6)) {
+// if (commonEventEditDTO.getPopulationIds().isEmpty()) {
+// return R.fail("上报人员为空");
+// }
+// }
EventDO eventDO = new EventDO();
BeanUtils.copyProperties(commonEventEditDTO, eventDO);
@@ -418,7 +420,8 @@
if (eventMapper.insert(eventDO) > 0) {
// 如果是特殊人群，则新增特殊人群与事件关系
- if (commonEventEditDTO.getEventType().equals(6)) {
+ if (commonEventEditDTO.getEventType().equals(6) && commonEventEditDTO.getPopulationIds() != null
+ && commonEventEditDTO.getPopulationIds().size() > 0) {
List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>();
commonEventEditDTO.getPopulationIds().forEach(populationId -> {
EventSpecialCrowdRecordDO specialCrowdRecordDO = new EventSpecialCrowdRecordDO();
@@ -1816,11 +1819,7 @@
if (eventDO == null) {
throw new ServiceException("id为" + id + "的事件不存在");
}
- if (eventDO.getEventStatus() != null
- && (eventDO.getEventStatus().intValue() == 1 || eventDO.getEventStatus().intValue() == 4)) {// 草稿
- // 或者
- // 已撤销
- // 的事件可以删除
+ if (eventDO.getEventStatus() != null) {
eventDO.setEventStatus(3);// 逻辑删除
eventDO.setUpdateBy(userId);
int updated = this.getBaseMapper().updateById(eventDO);
@@ -1945,8 +1944,8 @@
public R getGridEventStatisticsByApp(Long gridId, Long userId) {
GridEventStatisticsVO result = this.baseMapper.getGridEventStatisticsByApp(gridId);
if (result != null) {
- result.setTodayNum(result.getTodayNum() + result.getZfTodayNum());
- result.setMonthNum(result.getMonthNum() + result.getZfMonthNum());
+ result.setTodayNum(result.getTodayNum() + result.getZfTodayNum() + result.getSspTodayNum());
+ result.setMonthNum(result.getMonthNum() + result.getZfMonthNum() + result.getSspMonthNum());
// 查询当前网格员下管理的楼栋名称
List<Map<String, Object>> buildNameList = this.baseMapper.getMemberBuildName(userId);
--
Gitblit v1.7.1