展示心理咨询问题

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.smile.psychology.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyQuestionEntity;
 import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyAnswerFormDTO;
 import com.elink.esua.epdc.smile.dto.psychology.form.PsychologySubmitAnswerFormDTO;
 import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyUnansweredFormDTO;
@@ -25,11 +26,11 @@ import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListResul
 import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerListUserResultDTO;
 import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.smile.dto.psychology.result.PsychologyUnansweredResultDTO;
-import com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyQuestionEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 心理问题提问表
@@ -89,4 +90,14 @@ public interface PsychologyQuestionDao extends BaseDao<PsychologyQuestionEntity>
      * @since 2020/5/21 14:54
      */
     int updateQuestion(PsychologySubmitAnswerFormDTO dto);
+
+    /**
+     * 问题列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyQuestionEntity>
+     * @params [params]
+     * @author zhangyuan
+     * @since 2020/5/21 14:54
+     */
+    List<PsychologyQuestionEntity> selectListOfPsychologyQuestion(Map<String, Object> params);
 }

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

@@ -24,14 +24,14 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.smile.dto.constant.PsychologyConstant;
-import com.elink.esua.epdc.smile.dto.psychology.PsychologyQuestionDTO;
-import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyQuestionFormDTO;
 import com.elink.esua.epdc.modules.smile.psychology.dao.PsychologistDao;
 import com.elink.esua.epdc.modules.smile.psychology.dao.PsychologyQuestionDao;
 import com.elink.esua.epdc.modules.smile.psychology.entity.PsychologistEntity;
 import com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyQuestionEntity;
 import com.elink.esua.epdc.modules.smile.psychology.service.PsychologyQuestionService;
+import com.elink.esua.epdc.smile.dto.constant.PsychologyConstant;
+import com.elink.esua.epdc.smile.dto.psychology.PsychologyQuestionDTO;
+import com.elink.esua.epdc.smile.dto.psychology.form.PsychologyQuestionFormDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,11 +56,10 @@ public class PsychologyQuestionServiceImpl extends BaseServiceImpl<PsychologyQue
 
     @Override
     public PageData<PsychologyQuestionDTO> page(Map<String, Object> params) {
-        IPage<PsychologyQuestionEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, PsychologyQuestionDTO.class);
+        IPage<PsychologyQuestionEntity> page = getPage(params);
+        List<PsychologyQuestionEntity> entityList = baseDao.selectListOfPsychologyQuestion(params);
+        List<PsychologyQuestionDTO> list = ConvertUtils.sourceToTarget(entityList, PsychologyQuestionDTO.class);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override

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

@@ -17,7 +17,10 @@
             <result property="answerTime" column="ANSWER_TIME" />
         </collection>
     </resultMap>
-
+    <sql id="Base_Column_List">
+        ID,	USER_ID,	USER_NAME,	USER_AVATAR,	QUESTION_CONTENT,	ANONYMOUS_FLAG,	PSYCHOLOGIST_ID,
+	ANSWER_NUM,	DISPLAY_FLAG,	DEL_FLAG,	REVISION,	CREATED_BY,	CREATED_TIME,	UPDATED_BY,	UPDATED_TIME
+    </sql>
     <select id="selectListUserQuestions" resultMap="selectListUserQuestionsMap">
         SELECT
             pq.ID,
@@ -33,7 +36,8 @@
             LEFT JOIN epdc_psychology_answer pa ON pa.QUESTION_ID = pq.ID AND pa.DEL_FLAG = '0'
         WHERE
             pq.DEL_FLAG = '0'
-            and pq.USER_ID = #{userId}
+            AND pq.USER_ID = #{userId}
+            AND pq.DISPLAY_FLAG = '1'
             AND pq.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
         ORDER BY pq.CREATED_TIME DESC
         LIMIT #{pageIndex},  #{pageSize};
@@ -128,4 +132,17 @@
             DEL_FLAG = '0'
             AND ID = #{questionId}
     </update>
+
+    <select id="selectListOfPsychologyQuestion" resultType="com.elink.esua.epdc.modules.smile.psychology.entity.PsychologyQuestionEntity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        epdc_psychology_question pq
+        WHERE
+        pq.DEL_FLAG = '0'
+        <if test="userName != null and userName != ''">
+            AND pq.USER_NAME like CONCAT( '%', #{userName}, '%' )
+        </if>
+        ORDER BY pq.CREATED_TIME DESC
+    </select>
 </mapper>