From 0db2fe31365053b8947d154c8fac6fe3afa3aedc Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 27 二月 2023 17:32:40 +0800
Subject: [PATCH] 修改走访任务定时
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 048a816..e7d55dd 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
@@ -171,11 +171,9 @@
*/
@Override
public R<EventDetailsVO> eventDetails(Long id) {
- EventDO eventDO = eventMapper.selectById(id);
- if (eventDO != null) {
- EventDetailsVO eventDetailsVO = new EventDetailsVO();
- BeanUtils.copyProperties(eventDO, eventDetailsVO);
- EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
+ EventDetailsVO eventDetailsVO = eventMapper.getById(id);
+ if (eventDetailsVO != null) {
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDetailsVO.getGridId());
if (eventGridDataDO != null) {
eventDetailsVO.setGridName(eventGridDataDO.getGridName());
eventDetailsVO.setCommunityId(eventGridDataDO.getGridCommunityId());
@@ -253,17 +251,17 @@
eventDetailsVO.setTrans(eventTransferRecordVOS);
// 查询网格员头像,姓名
- Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
+ Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDetailsVO.getGridMemberId());
if (!CollectionUtils.isEmpty(gridMember)) {
eventDetailsVO.setGridMemberName(
gridMember.get("nick_name") == null ? "" : gridMember.get("nick_name").toString());
eventDetailsVO.setGridMemberImageUrl(
gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString());
}
- if (Objects.equals(eventDO.getGridMemberId(), eventDO.getCreateBy())) {
+ if (Objects.equals(eventDetailsVO.getGridMemberId(), eventDetailsVO.getCreateBy())) {
eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName());
} else {
- Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy());
+ Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDetailsVO.getCreateBy());
eventDetailsVO
.setCreator(createUser.get("nick_name") == null ? "" : createUser.get("nick_name").toString());
}
@@ -1300,7 +1298,7 @@
@Override
public R<ComActVO> actList() {
- return communityService.listCommunityAll();
+ return communityService.listCommunityAll(null);
}
@Override
@@ -1381,10 +1379,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());
@@ -1404,11 +1403,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(),
@@ -2668,7 +2669,6 @@
}
});
}
- statisticsVO.setGridIncidentList(eventResultList);
// 查询所有小区
List<CivilVillageStatisticsVO> villageStatisticsList =
this.baseMapper.getCivilScreenVillageList(eventListDTO.getCommunityId());
--
Gitblit v1.7.1