| | |
| | | } 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()); |
| | |
| | | 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(), |