diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java index b8de802fe0..f3866f0a13 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/EventProjectInfoDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -29,6 +30,9 @@ public class EventProjectInfoDTO implements Serializable { */ private String operationTime; + @JsonIgnore + private String userId; + /** * 报事说明 */ diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java index 85e0a0a9b2..b16e292f44 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventDetailResultDTO.java @@ -1,6 +1,7 @@ package com.epmet.dto.result; import com.epmet.dto.EventProjectInfoDTO; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -37,6 +38,9 @@ public class EventDetailResultDTO implements Serializable { */ private String gridName; + @JsonIgnore + private String gridId; + /** * 是否办结【是:true,否:false】 */ @@ -62,11 +66,25 @@ public class EventDetailResultDTO implements Serializable { */ private List eventPerson; + /** + * 报事人名字 + */ + private String eventPeopleName; + + @JsonIgnore + private String eventUserId; + /** * 项目信息 */ private EventProjectInfoDTO projectInfo; + @JsonIgnore + private String projectId; + + @JsonIgnore + private Boolean isProject; + public EventDetailResultDTO() { this.eventTime = ""; this.eventContent = ""; diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index d5c2dbab5d..a4c1b69b36 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.EventProjectInfoDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.ProjectStaffDTO; import com.epmet.dto.form.LatestListFormDTO; @@ -206,4 +207,12 @@ public interface ProjectDao extends BaseDao { * @return java.util.List */ List selectUnResolvedListByGrid(@Param("gridId")String gridId); + + /** + * @Description 查询报事转项目详情 + * @Param projectId + * @author zxc + * @date 2021/8/4 2:43 下午 + */ + EventProjectInfoDTO selectEventProjectInfo(@Param("projectId")String projectId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java index 95f95f4959..87ffeb3d1a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.dto.result.MyReportedResultDTO; import com.epmet.entity.ResiEventEntity; @@ -54,4 +55,12 @@ public interface ResiEventDao extends BaseDao { * @date 2021/8/3 23:21 */ List queryMyReported(@Param("userId") String userId, @Param("statusCondition")String statusCondition); + + /** + * @Description 查询报事详情 + * @Param eventId + * @author zxc + * @date 2021/8/4 2:16 下午 + */ + EventDetailResultDTO selectEventDetail(@Param("eventId")String eventId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 1c41b517fb..2d27b7284e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -35,11 +35,13 @@ import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.EventConstant; import com.epmet.constant.ResiEventAction; import com.epmet.dao.*; +import com.epmet.dto.EventProjectInfoDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.GovProjectOpenFeignClient; import com.epmet.service.ResiEventService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -82,6 +84,8 @@ public class ResiEventServiceImpl extends BaseServiceImpl staffName = govOrgOpenFeignClient.staffName(eventProjectInfo.getUserId()); + if (!staffName.success()){ + throw new RenException("查询工作人员名字失败"); + } + eventProjectInfo.setOperationName(staffName.getData()); + dto.setProjectInfo(eventProjectInfo); + } + // 查询报事人名字 + List userIdList = new ArrayList<>(); + userIdList.add(dto.getEventUserId()); + Result> userResult=epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); + if(!userResult.success()|| CollectionUtils.isEmpty(userResult.getData())){ + throw new RenException("查询当前用户信息异常"); + } + userResult.getData().forEach(u -> { + if (u.getUserId().equals(dto.getEventUserId())){ + dto.setEventPeopleName(u.getShowName()); + } + }); + // 查询所属网格 + Result gridNameResult = govOrgOpenFeignClient.gridName(dto.getGridId()); + if (!gridNameResult.success()){ + throw new RenException("查询所属网格失败"); + } + dto.setGridName(gridNameResult.getData()); + return dto; } + /** * 我要报事-提交(尹) * diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 5940f47003..7b0dac13a0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -379,4 +379,17 @@ ORDER BY a.UPDATED_TIME DESC + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index c80501a831..a9461bd9b4 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -88,4 +88,44 @@ order by re.LATEST_OPERATED_TIME desc + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file