java/zhihuishenqu.git

			@@ -17,7 +17,6 @@
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.service_grid.dao.*;
			import com.panzhihua.service_grid.model.dos.*;
			import com.panzhihua.service_grid.service.EventGridDataService;
			import com.panzhihua.service_grid.service.EventResourceService;
			import com.panzhihua.service_grid.service.EventService;
			import com.panzhihua.service_grid.service.EventTransferRecordService;
			@@ -25,12 +24,14 @@
			import org.springframework.stereotype.Service;
			import org.springframework.beans.BeanUtils;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;

			/**
			* @author cedoo
			@@ -53,8 +54,6 @@
			private EventGridDataMapper eventGridDataMapper;
			@Resource
			private EventGridMemberRelationMapper eventGridMemberRelationMapper;
			@Resource
			private EventGridDataService eventGridDataService;

			/**
			* 分页查找事件
			@@ -234,10 +233,11 @@
			}
			eventDetailsVO.setTrans(eventTransferRecordVOS);

			//查询事件发布人头像
			String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId());
			if (StringUtils.isNotEmpty(imageUrl)) {
			eventDetailsVO.setGridMemberImageUrl(imageUrl);
			//查询网格员头像,姓名
			Map<String,Object> userBaseInfoMap = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
			if (!CollectionUtils.isEmpty(userBaseInfoMap)) {
			eventDetailsVO.setCreator(userBaseInfoMap.get("name") == null ? "" : userBaseInfoMap.get("name").toString());
			eventDetailsVO.setGridMemberImageUrl(userBaseInfoMap.get("image_url") == null ? "" : userBaseInfoMap.get("image_url").toString());
			}

			return R.ok(eventDetailsVO);
			@@ -280,6 +280,7 @@
			eventResourceDO.setRefId(eventDO.getId());
			eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
			eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
			eventResourceDO.setResourceName(commonEventAddDTO.getAudio().substring(commonEventAddDTO.getAudio().lastIndexOf("/")+1));
			int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
			if (audioAdd != 1) {
			throw new ServiceException("添加音频失败");
			@@ -294,6 +295,7 @@
			eventResourceDO.setRefId(eventDO.getId());
			eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
			eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
			eventResourceDO.setResourceName(commonEventAddDTO.getVideo().substring(commonEventAddDTO.getVideo().lastIndexOf("/")+1));
			int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
			if (videoAdd != 1) {
			throw new ServiceException("添加视频失败");
			@@ -309,6 +311,7 @@
			eventResourceDO.setUrl(pica[i]);
			eventResourceDO.setRefId(eventDO.getId());
			eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
			eventResourceDO.setResourceName(pica[i].substring(pica[i].lastIndexOf("/")+1));
			int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
			if (picAdd != 1) {
			throw new ServiceException("添加图片失败");
			@@ -515,6 +518,8 @@
			eventDO.setUpdateBy(eventRevokeDTO.getUserId());
			eventDO.setProcessType(1);//网格员处理
			eventDO.setCommunityProcess(0);//非社区处理
			eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
			eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
			int updated = this.getBaseMapper().updateById(eventDO);
			if (updated == 1) {
			addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
			@@ -1262,12 +1267,12 @@
			if (eventDO.getEventCategory() == 1) {
			boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
			if (!canRevoke) {
			return R.fail("当前事件不是上报状态，不允许标为无效");
			return R.fail("当前事件不是上报状态，不允许撤销");
			}
			} else if (eventDO.getEventCategory() == 2) {
			boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
			if (!canRevoke) {
			return R.fail("当前事件不是发布状态，不允许标为无效");
			return R.fail("当前事件不是发布状态，不允许撤销");
			}
			} else {
			return R.fail("");
			@@ -1281,6 +1286,8 @@
			eventDO.setEventStatus(4);//4、撤销
			eventDO.setProcessType(1);//网格员处理
			eventDO.setCommunityProcess(0);//非社区处理
			eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
			eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
			int updated = this.getBaseMapper().updateById(eventDO);
			if (updated == 1) {
			addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1, "标为无效", eventRevokeDTO.getCommunityId(), eventRevokeDTO.getCommunityName(), 4);
			@@ -1777,15 +1784,15 @@
			throw new ServiceException("id为" + id + "的事件不存在");
			}
			if (eventDO.getEventCategory() != null) {
			if (eventDO.getEventCategory() == 1) {
			if (eventDO.getEventCategory() == 1) {//
			boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
			if (!canRevoke) {
			throw new ServiceException("当前事件不是上报状态，不允许标为无效");
			throw new ServiceException("当前事件不是上报状态，不允许撤销");
			}
			} else if (eventDO.getEventCategory() == 2) {
			} else if (eventDO.getEventCategory() == 2) {//宣传教育
			boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
			if (!canRevoke) {
			throw new ServiceException("当前事件不是发布状态，不允许标为无效");
			throw new ServiceException("当前事件不是发布状态，不允许撤销");
			}
			} else {
			throw new ServiceException("事件分类错误");