java/zhihuishenqu.git

			@@ -5,6 +5,7 @@

			import javax.annotation.Resource;

			import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -399,11 +400,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);
			@@ -420,7 +421,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();
			@@ -1818,11 +1820,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);
			@@ -2644,4 +2642,15 @@
			public R gridMemberStatisticsAll(MemberStatisticsAdminDTO statisticsAdminDTO) {
			return R.ok(eventGridMemberRelationMapper.gridMemberStatisticsAll(statisticsAdminDTO));
			}

			/**
			* 西区大数据分析平台-综合治理栏
			* @return
			*/
			@Override
			public R getComprehensiveGovernanceStatics() {
			EventComprehensiveGovernanceStatisticsVO governanceStatisticsVO = this.baseMapper.selectComprehensiveGovernanceStatics();
			governanceStatisticsVO.generateGovernanceTotal();
			return R.ok(governanceStatisticsVO);
			}
			}