bug修改

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkIssueController.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -53,7 +54,7 @@ public class ApiWorkIssueController {
      * @return
      */
     @GetMapping("event/detail/{id}")
-    public Result<EventAppDetailResultDTO> eventDetail(@PathVariable("id") String id) {
+    public Result<EpdcEventsDetailDTO> eventDetail(@PathVariable("id") String id) {
         return workIssueService.detail(id);
     }
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.config.FeignRequestInterceptor;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -19,8 +20,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
-
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkIssueFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
 public interface WorkIssueFeignClient {
 
     /**
@@ -45,7 +44,7 @@ public interface WorkIssueFeignClient {
      * @return
      */
     @GetMapping(value = "events/epdc-app/work/event/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EventAppDetailResultDTO> detail(@PathVariable("id") String id);
+    Result<EpdcEventsDetailDTO> detail(@PathVariable("id") String id);
 
     /**
      * 事件分类

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
@@ -35,7 +36,7 @@ public class WorkIssueFeignClientFallback implements WorkIssueFeignClient {
     }
 
     @Override
-    public Result<EventAppDetailResultDTO> detail(String id) {
+    public Result<EpdcEventsDetailDTO> detail(String id) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "detail", id);
     }
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -51,7 +52,7 @@ public interface WorkIssueService {
      * @param id
      * @return
      */
-    Result<EventAppDetailResultDTO> detail(String id);
+    Result<EpdcEventsDetailDTO> detail(String id);
 
     /**
      *事件分类

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -65,7 +66,7 @@ public class WorkIssueServiceImpl implements WorkIssueService {
      * @return
      */
     @Override
-    public Result<EventAppDetailResultDTO> detail(String id) {
+    public Result<EpdcEventsDetailDTO> detail(String id) {
         return workIssueFeignClient.detail(id);
     }