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,11 @@
			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.*;

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

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

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

			return R.ok(eventDetailsVO);