diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java new file mode 100644 index 0000000000..37049a3ef8 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventDetailFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 数字赋能平台-个人档案-上报事件-事件详情 + */ +@Data +public class ResiEventDetailFormDTO implements Serializable { + private static final long serialVersionUID = 4449275163195979994L; + public interface AddUserInternalGroup { + } + @NotBlank(message = "resiEventId不能为空",groups =AddUserInternalGroup.class ) + private String resiEventId; +} 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 18295391c5..0b6bb8ccb2 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 @@ -11,7 +11,7 @@ import java.util.List; /** * @Author zxc * @DateTime 2021/8/3 1:30 下午 - * @DESC + * @DESC 两端通用时间详情接口+个人档案-数据分析-事件详情 */ @Data public class EventDetailResultDTO implements Serializable { @@ -87,10 +87,10 @@ public class EventDetailResultDTO implements Serializable { @JsonIgnore private List orgNameList; - @JsonIgnore + //@JsonIgnore private String projectId; - @JsonIgnore + //@JsonIgnore private Boolean isProject; public EventDetailResultDTO() { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index c868dbff0d..b3dd410a81 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -57,6 +57,18 @@ public class ResiEventController { return new Result().ok(resiEventService.eventDetail(formDTO, tokenDto)); } + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + @PostMapping("eventdetail-icdata") + public Result eventDetailForIcData(@RequestBody ResiEventDetailFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO,ResiEventDetailFormDTO.AddUserInternalGroup.class); + return new Result().ok(resiEventService.eventDetailForIcData(formDTO)); + } + /** * 我要报事-提交(尹) * diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index f9712c498b..b73e1f7908 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -41,6 +41,14 @@ public interface ResiEventService extends BaseService { */ EventDetailResultDTO eventDetail(EventDetailFormDTO formDTO, TokenDto tokenDto); + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO); + /** * 我要报事-提交(尹) * 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 cbd5ff6b3c..01b0377ad3 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 @@ -163,7 +163,20 @@ public class ResiEventServiceImpl extends BaseServiceImpl data = orgResult.getData(); dto.setEventOrg(data); - // 更改已读状态 报事人的红点:resi_event,艾特人的:resi_event_mention,所代表的组织的:resi_event_report_org - if (tokenDto.getApp().equals(EventConstant.TYPE_RESI)){ - baseDao.updateResiEvent(tokenDto.getUserId(),formDTO.getEventId()); - baseDao.updateEventMention(tokenDto.getUserId(),formDTO.getEventId()); - }else if (tokenDto.getApp().equals(EventConstant.TYPE_GOV)){ - resiEventReportOrgDao.updateEventOrg(formDTO.getEventId(), formDTO.getOrgId()); - } return dto; } + /** + * 数字赋能平台-个人档案-事件详情 + * + * @param formDTO + * @return + */ + public EventDetailResultDTO eventDetailForIcData(ResiEventDetailFormDTO formDTO){ + return getEventDetailResultDTO(formDTO.getResiEventId()); + } /** * 我要报事-提交(尹)