From 1b0b406688714e86da7abac0a8be67bdb915f8e3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 6 Jul 2020 17:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BF=83=E7=90=86=E5=92=A8?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../psychology/dao/PsychologyQuestionDao.java | 13 +++++++++++- .../impl/PsychologyQuestionServiceImpl.java | 15 +++++++------ .../psychology/PsychologyQuestionDao.xml | 21 +++++++++++++++++-- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/dao/PsychologyQuestionDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/dao/PsychologyQuestionDao.java index 2bcd7c8..0cf64f1 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/dao/PsychologyQuestionDao.java +++ b/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 * @since 2020/5/21 14:54 */ int updateQuestion(PsychologySubmitAnswerFormDTO dto); + + /** + * 问题列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List selectListOfPsychologyQuestion(Map params); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/service/impl/PsychologyQuestionServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/service/impl/PsychologyQuestionServiceImpl.java index d76b653..866923b 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/psychology/service/impl/PsychologyQuestionServiceImpl.java +++ b/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 page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PsychologyQuestionDTO.class); + IPage page = getPage(params); + List entityList = baseDao.selectListOfPsychologyQuestion(params); + List list = ConvertUtils.sourceToTarget(entityList, PsychologyQuestionDTO.class); + return new PageData<>(list, page.getTotal()); } @Override diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyQuestionDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyQuestionDao.xml index 1e90d8c..d4b454e 100644 --- a/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyQuestionDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/smile/psychology/PsychologyQuestionDao.xml @@ -17,7 +17,10 @@ - + + 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 + + SELECT + + FROM + epdc_psychology_question pq + WHERE + pq.DEL_FLAG = '0' + + AND pq.USER_NAME like CONCAT( '%', #{userName}, '%' ) + + ORDER BY pq.CREATED_TIME DESC + \ No newline at end of file