diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index e8e79882f7..1acbb42f43 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -1,9 +1,11 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -19,6 +21,7 @@ import com.epmet.constant.*; import com.epmet.dao.ProjectOrgRelationDao; import com.epmet.dao.ProjectProcessAttachmentDao; import com.epmet.dao.ProjectProcessDao; +import com.epmet.dao.ResiEventReportOrgDao; import com.epmet.dto.IssueProjectCategoryDictDTO; import com.epmet.dto.IssueProjectTagDictDTO; import com.epmet.dto.ProjectStaffDTO; @@ -91,6 +94,8 @@ public class ProjectTraceServiceImpl implements ProjectTraceS private LoginUserUtil loginUserUtil; @Autowired private ResiEventService resiEventService; + @Autowired + private ResiEventReportOrgDao resiEventReportOrgDao; @Override public List getPendProjectList(TokenDto tokenDto, ProjectListFromDTO fromDTO) { @@ -637,6 +642,12 @@ public class ProjectTraceServiceImpl implements ProjectTraceS if (!CollectionUtils.isEmpty(projectEntityList)) { throw new RenException(EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getCode(), EpmetErrorCode.RESI_EVENT_SHIFT_PROJECT.getMsg()); } + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(ResiEventReportOrgEntity::getResiEventId,formDTO.getEventId()); + ResiEventReportOrgEntity reportOrgEntity = resiEventReportOrgDao.selectOne(tWrapper); + if (reportOrgEntity == null){ + throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); + } List staffList = formDTO.getStaffList(); //1.文字内容安全校验 List list = new ArrayList<>(); @@ -748,6 +759,10 @@ public class ProjectTraceServiceImpl implements ProjectTraceS entity.setCategoryId(item.getId()); entity.setCategoryPids(ca.getPids()); entity.setCategoryCode(ca.getCategoryCode()); + //如果事件上报给 网格 则这个项目是属于网格 设置网格ID˚ + if (OrgTypeEnum.GRID.getCode().equals(reportOrgEntity.getOrgType())){ + entity.setGridId(reportOrgEntity.getOrgId()); + } categoryEntityList.add(entity); } });