居民端-心理咨询-问题列表app接口

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java

@@ -24,9 +24,12 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 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.modules.psychology.service.PsychologistService;
 import com.elink.esua.epdc.modules.psychology.service.PsychologyQuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,4 +73,16 @@ public class AppPsychologistController {
         psychologyQuestionService.saveFromApp(formDto);
         return new Result();
     }
+
+    @GetMapping("listUserQuestion")
+    public Result<List<PsychologyAnswerListUserResultDTO>> listUserQuestion(@RequestBody PsychologyAnswerFormDTO formDto) throws Exception {
+        List<PsychologyAnswerListUserResultDTO> data = psychologistService.listUserQuestion(formDto);
+        return new Result<List<PsychologyAnswerListUserResultDTO>>().ok(data);
+    }
+
+    @GetMapping("listQuestion")
+    public Result<List<PsychologyAnswerListResultDTO>> listQuestion(@RequestBody PsychologyAnswerFormDTO formDto) throws Exception {
+        List<PsychologyAnswerListResultDTO> data = psychologistService.listQuestion(formDto);
+        return new Result<List<PsychologyAnswerListResultDTO>>().ok(data);
+    }
 }

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java

@@ -18,8 +18,13 @@
 package com.elink.esua.epdc.modules.psychology.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerInfoResultDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerUserInfoResultDTO;
 import com.elink.esua.epdc.modules.psychology.entity.PsychologyAnswerEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 心理问题答复表
@@ -29,5 +34,24 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PsychologyAnswerDao extends BaseDao<PsychologyAnswerEntity> {
-	
+
+    /**
+     * 居民端-心理咨询-我的问题列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.psychology.entity.PsychologyAnswerEntity>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<PsychologyAnswerUserInfoResultDTO> listUserQuestion(@Param("questionId") String questionId);
+
+    /**
+     * 居民端-心理咨询-我的问题列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.psychology.entity.PsychologyAnswerInfoResultDTO>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<PsychologyAnswerInfoResultDTO> listQuestion(@Param("questionId") String questionId);
 }

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java

@@ -18,9 +18,14 @@
 package com.elink.esua.epdc.modules.psychology.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.modules.psychology.entity.PsychologyQuestionEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 心理问题提问表
  *
@@ -29,5 +34,25 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PsychologyQuestionDao extends BaseDao<PsychologyQuestionEntity> {
-	
+
+    /**
+     * 居民端-心理咨询-我的问题列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.psychology.entity.PsychologyAnswerEntity>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<PsychologyAnswerListUserResultDTO> listUserQuestion(PsychologyAnswerFormDTO dto);
+
+    /**
+     * 居民端-心理咨询-问题列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.psychology.entity.PsychologyAnswerListResultDTO>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<PsychologyAnswerListResultDTO> listQuestion(PsychologyAnswerFormDTO dto);
+
 }

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java

@@ -22,8 +22,11 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.psychology.PsychologistDTO;
 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.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.modules.psychology.entity.PsychologistEntity;
 
 import java.util.List;
@@ -117,4 +120,23 @@ public interface PsychologistService extends BaseService<PsychologistEntity> {
      */
     PsychologistInfoResultDTO psychologistInfo(PsychologistInfoFormDTO dto);
 
+    /**
+     * 居民端-心理咨询-我的问题列表
+     *
+     * @param dto
+     * @return List<PsychologyAnswerListUserResultDTO>
+     * @author zhangyuan
+     * @date 2020-06-04
+     */
+    List<PsychologyAnswerListUserResultDTO> listUserQuestion(PsychologyAnswerFormDTO dto);
+
+    /**
+     * 居民端-心理咨询-问题列表
+     *
+     * @param dto
+     * @return List<PsychologyAnswerListResultDTO>
+     * @author zhangyuan
+     * @date 2020-06-04
+     */
+    List<PsychologyAnswerListResultDTO> listQuestion(PsychologyAnswerFormDTO dto);
 }

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java

@@ -26,10 +26,12 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.psychology.PsychologistDTO;
 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.result.PsychologistInfoResultDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
-import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
+import com.elink.esua.epdc.dto.psychology.result.*;
 import com.elink.esua.epdc.modules.psychology.dao.PsychologistDao;
 import com.elink.esua.epdc.modules.psychology.dao.PsychologistTitleRelationDao;
+import com.elink.esua.epdc.modules.psychology.dao.PsychologyAnswerDao;
+import com.elink.esua.epdc.modules.psychology.dao.PsychologyQuestionDao;
 import com.elink.esua.epdc.modules.psychology.entity.PsychologistEntity;
 import com.elink.esua.epdc.modules.psychology.entity.PsychologistTitleRelationEntity;
 import com.elink.esua.epdc.modules.psychology.redis.PsychologistRedis;
@@ -60,6 +62,12 @@ public class PsychologistServiceImpl extends BaseServiceImpl<PsychologistDao, Ps
     @Resource
     PsychologistTitleRelationDao psychologistTitleRelationDao;
 
+    @Resource
+    PsychologyQuestionDao psychologyQuestionDao;
+
+    @Resource
+    PsychologyAnswerDao psychologyAnswerDao;
+
     @Override
     public PageData<PsychologistDTO> page(Map<String, Object> params) {
         IPage<PsychologistEntity> page = getPage(params);
@@ -148,4 +156,25 @@ public class PsychologistServiceImpl extends BaseServiceImpl<PsychologistDao, Ps
         return data;
     }
 
+    @Override
+    public List<PsychologyAnswerListUserResultDTO> listUserQuestion(PsychologyAnswerFormDTO dto) {
+        List<PsychologyAnswerListUserResultDTO> data = psychologyQuestionDao.listUserQuestion(dto);
+        data.forEach(item -> {
+            List<PsychologyAnswerUserInfoResultDTO> list = psychologyAnswerDao.listUserQuestion(item.getId());
+            item.setAnswerList(list == null ? new ArrayList<>() : ConvertUtils.sourceToTarget(list, PsychologyAnswerUserInfoResultDTO.class));
+        });
+
+        return data;
+    }
+
+    @Override
+    public List<PsychologyAnswerListResultDTO> listQuestion(PsychologyAnswerFormDTO dto) {
+        List<PsychologyAnswerListResultDTO> data = psychologyQuestionDao.listQuestion(dto);
+        data.forEach(item -> {
+            List<PsychologyAnswerInfoResultDTO> list = psychologyAnswerDao.listQuestion(item.getId());
+            item.setAnswerList(list == null ? new ArrayList<>() : ConvertUtils.sourceToTarget(list, PsychologyAnswerInfoResultDTO.class));
+        });
+
+        return data;
+    }
 }

epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml

@@ -16,6 +16,35 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <sql id="Base_Column_List">
+        ID,	QUESTION_ID,	PSYCHOLOGIST_ID,	PSYCHOLOGIST_NAME,	ANSWER_CONTENT,
+	DEL_FLAG,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME
+    </sql>
+    <select id="listUserQuestion" resultType="com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerUserInfoResultDTO">
+        SELECT
+        PSYCHOLOGIST_ID,	PSYCHOLOGIST_NAME,	ANSWER_CONTENT,	date_format(CREATED_TIME, '%Y-%m-%d') AS ANSWER_TIME
+        FROM
+        epdc_psychology_answer
+        WHERE
+        DEL_FLAG = '0'
+        <if test="questionId != null and questionId != ''">
+            AND QUESTION_ID = #{questionId}
+        </if>
+        ORDER BY
+        CREATED_TIME DESC
+    </select>
 
-
+    <select id="listQuestion" resultType="com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerInfoResultDTO">
+        SELECT
+        PSYCHOLOGIST_ID,	PSYCHOLOGIST_NAME,	ANSWER_CONTENT
+        FROM
+        epdc_psychology_answer
+        WHERE
+        DEL_FLAG = '0'
+        <if test="questionId != null and questionId != ''">
+            AND QUESTION_ID = #{questionId}
+        </if>
+        ORDER BY
+        CREATED_TIME DESC
+    </select>
 </mapper>

epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml

@@ -20,6 +20,32 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <sql id="Base_Column_List">
+        ID,	USER_ID,	USER_NAME,	USER_AVATAR,	QUESTION_CONTENT,	ANONYMOUS_FLAG,	PSYCHOLOGIST_ID,	ANSWER_NUM,
+	DEL_FLAG,   DISPLAY_FLAG,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME
+    </sql>
+    <select id="listUserQuestion" resultType="com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO">
+        SELECT
+        ID,	USER_ID,	USER_NAME,	USER_AVATAR,	QUESTION_CONTENT,   CREATED_TIME AS QUESTION_TIME
+        FROM
+        epdc_psychology_question
+        WHERE
+        DEL_FLAG = '0'
+        <if test="userId != null and userId != ''">
+            AND USER_ID = #{userId}
+        </if>
+        ORDER BY
+        CREATED_TIME DESC
+    </select>
 
-
+    <select id="listQuestion" resultType="com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO">
+        SELECT
+        ID,	USER_ID,	USER_NAME,	USER_AVATAR,	QUESTION_CONTENT
+        FROM
+        epdc_psychology_question
+        WHERE
+        DEL_FLAG = '0'
+        ORDER BY
+        CREATED_TIME DESC
+    </select>
 </mapper>