diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java index ee5daf0..9607b46 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java @@ -65,6 +65,6 @@ public interface PsychologyQuestionDao extends BaseDao * @author zhangyuan * @since 2020/5/21 14:54 */ - List listUnansweredQuestion(PsychologyUnansweredFormDTO dto); + List listUnansweredQuestion(PsychologyUnansweredFormDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java index 2c63778..39e2c83 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java @@ -194,8 +194,7 @@ public class PsychologistServiceImpl extends BaseServiceImpl listUnansweredQuestion(PsychologyUnansweredFormDTO dto) { // sql limit条件转换 dto.setPageIndex((dto.getPageIndex() - 1) * dto.getPageSize()); - List data = psychologyQuestionDao.listUnansweredQuestion(dto); - return ConvertUtils.sourceToTarget(data, PsychologyUnansweredResultDTO.class); + return psychologyQuestionDao.listUnansweredQuestion(dto); } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml index 00116c7..333295e 100644 --- a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml @@ -51,9 +51,9 @@ LIMIT #{pageIndex}, #{pageSize}; - SELECT - + ID, QUESTION_CONTENT, CREATED_TIME AS QUESTION_TIME FROM epdc_psychology_question WHERE