工作端--心理咨询-我回答的问题列表api接口

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java

@@ -1,7 +1,9 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.service.WorkPropertyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,12 +29,25 @@ public class ApiWorkPropertyController {
      * 工作端--待解答的心理咨询问题列表
      *
      * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyUnansweredResultDTO >
-     * @params [userDetail, formDto]
-     * @author liuchuang
-     * @since 2019/10/22 15:33
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/6/9 15:33
      */
     @GetMapping("psychology/listQuestion")
     public Result<List<PsychologyUnansweredResultDTO>> listQuestion(PsychologyUnansweredFormDTO formDto) {
         return workPropertyService.listUnansweredQuestion(formDto);
     }
+
+    /**
+     * 工作端--心理咨询-我回答的问题列表
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerOfMineResultDTO >
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/6/9 15:33
+     */
+    @GetMapping("psychology/listMyQuestion")
+    public Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(PsychologyAnswerFormDTO formDto) {
+        return workPropertyService.listMyQuestion(formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java

@@ -18,8 +18,14 @@ import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
 import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO;
 import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
 import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
-import com.elink.esua.epdc.dto.psychology.form.*;
-import com.elink.esua.epdc.dto.psychology.result.*;
+import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologistInfoFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java

@@ -3,7 +3,9 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.feign.fallback.WorkPropertyFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -30,4 +32,15 @@ public interface WorkPropertyFeignClient {
      */
     @PostMapping(value = "news/epdc-app/psychology/listUnansweredQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<PsychologyUnansweredResultDTO>> listUnansweredQuestion(@RequestBody PsychologyUnansweredFormDTO fromDTO);
+
+    /***
+     * 工作端--待解答的心理咨询问题列表
+     * @param fromDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO >
+     * @author zhangyuan
+     * @date 2020/6/8 9:25
+     */
+    @PostMapping(value = "news/epdc-app/psychology/listMyQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java

@@ -3,7 +3,9 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.feign.WorkPropertyFeignClient;
 import org.springframework.stereotype.Component;
@@ -11,8 +13,8 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * @Author LPF
- * @Date 2019/11/18 16:39
+ * @Author zhangyuan
+ * @Date 2020/6/9 16:39
  */
 @Component
 public class WorkPropertyFeignClientFallback implements WorkPropertyFeignClient {
@@ -21,4 +23,9 @@ public class WorkPropertyFeignClientFallback implements WorkPropertyFeignClient
     public Result<List<PsychologyUnansweredResultDTO>> listUnansweredQuestion(PsychologyUnansweredFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listUnansweredQuestion", formDto);
     }
+
+    @Override
+    public Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(PsychologyAnswerFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listMyQuestion", formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java

@@ -1,7 +1,9 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 
 import java.util.List;
@@ -23,4 +25,14 @@ public interface WorkPropertyService {
      * @date 2020/6/8 09:15
      */
     Result<List<PsychologyUnansweredResultDTO>> listUnansweredQuestion(PsychologyUnansweredFormDTO formDto);
+
+    /**
+     * 工作端--心理咨询-我回答的问题列表
+     *
+     * @param formDto    查询参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.PsychologyAnswerListResultDTO>>
+     * @author zhangyuan
+     * @date 2020/6/8 09:15
+     */
+    Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(PsychologyAnswerFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java

@@ -1,7 +1,9 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.feign.WorkPropertyFeignClient;
 import com.elink.esua.epdc.service.WorkPropertyService;
@@ -27,4 +29,10 @@ public class WorkPropertyServiceImpl implements WorkPropertyService {
 
         return workPropertyFeignClient.listUnansweredQuestion(formDto);
     }
+
+    @Override
+    public Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(PsychologyAnswerFormDTO formDto) {
+
+        return workPropertyFeignClient.listMyQuestion(formDto);
+    }
 }