From 2e7382f34f7a3c76442558d6dd0caa645c78ce96 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 9 Jun 2020 16:03:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF--=E5=BF=83=E7=90=86?= =?UTF-8?q?=E5=92=A8=E8=AF=A2-=E6=88=91=E5=9B=9E=E7=AD=94=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=88=97=E8=A1=A8app=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppPsychologistController.java | 14 +++++++---- .../PsychologistTitleController.java | 2 +- .../PsychologistTitleRelationController.java | 2 +- .../PsychologyAnswerController.java | 2 +- .../PsychologyQuestionController.java | 2 +- .../psychology/dao/PsychologyAnswerDao.java | 13 +++++++++- .../psychology/dao/PsychologyQuestionDao.java | 13 +++++++++- .../service/PsychologistService.java | 12 +++++++++- .../service/impl/PsychologistServiceImpl.java | 24 +++++++++++++++---- .../PsychologistTitleRelationServiceImpl.java | 4 ++-- .../impl/PsychologyAnswerServiceImpl.java | 4 ++-- .../impl/PsychologyQuestionServiceImpl.java | 4 ++-- .../mapper/psychology/PsychologyAnswerDao.xml | 12 +++++++++- .../psychology/PsychologyQuestionDao.xml | 20 +++++++++++++++- 14 files changed, 105 insertions(+), 23 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java index e2c090b..8ba6db6 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java @@ -77,16 +77,22 @@ public class AppPsychologistController { } @GetMapping("listQuestion") - public Result> listQuestion(@RequestBody PsychologyAnswerFormDTO formDto) throws Exception { - List data = psychologistService.listQuestion(formDto); + public Result> listAllQuestion(@RequestBody PsychologyAnswerFormDTO formDto) throws Exception { + List data = psychologistService.listAllQuestion(formDto); return new Result>().ok(data); } @GetMapping("listUnansweredQuestion") public Result> listUnansweredQuestion(@RequestBody PsychologyUnansweredFormDTO formDto) throws Exception { - UserDetail user = SecurityUser.getUser(); - formDto.setUserId(user.getId().toString()); List data = psychologistService.listUnansweredQuestion(formDto); return new Result>().ok(data); } + + @GetMapping("listMyQuestion") + public Result> listMyQuestion(@RequestBody PsychologyAnswerFormDTO formDto) throws Exception { + UserDetail user = SecurityUser.getUser(); + formDto.setUserId(user.getId().toString()); + List data = psychologistService.listMyQuestion(formDto); + return new Result>().ok(data); + } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistTitleController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistTitleController.java index 2df2f69..27ef629 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistTitleController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistTitleController.java @@ -23,8 +23,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.psychology.PsychologistTitleDTO; import com.elink.esua.epdc.modules.psychology.excel.PsychologistTitleExcel; import com.elink.esua.epdc.modules.psychology.service.PsychologistTitleService; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistTitleRelationController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistTitleRelationController.java index a2521fb..a25e922 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistTitleRelationController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologistTitleRelationController.java @@ -23,8 +23,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.psychology.PsychologistTitleRelationDTO; import com.elink.esua.epdc.modules.psychology.excel.PsychologistTitleRelationExcel; import com.elink.esua.epdc.modules.psychology.service.PsychologistTitleRelationService; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologyAnswerController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologyAnswerController.java index a121621..7155edf 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologyAnswerController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologyAnswerController.java @@ -23,8 +23,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.psychology.PsychologyAnswerDTO; import com.elink.esua.epdc.modules.psychology.excel.PsychologyAnswerExcel; import com.elink.esua.epdc.modules.psychology.service.PsychologyAnswerService; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologyQuestionController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologyQuestionController.java index a3e432e..32ab270 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologyQuestionController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/PsychologyQuestionController.java @@ -23,8 +23,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.psychology.PsychologyQuestionDTO; import com.elink.esua.epdc.modules.psychology.excel.PsychologyQuestionExcel; import com.elink.esua.epdc.modules.psychology.service.PsychologyQuestionService; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java index 5938c74..5d055d3 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java @@ -53,5 +53,16 @@ public interface PsychologyAnswerDao extends BaseDao { * @author zhangyuan * @since 2020/5/21 14:54 */ - List listQuestion(@Param("questionId") String questionId); + List listAllQuestion(@Param("questionId") String questionId); + + + /** + * 工作端--心理咨询-我回答的问题列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List listMyQuestion(@Param("userId") String userId); } \ No newline at end of file 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 9607b46..23b7e98 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 @@ -22,6 +22,7 @@ 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.PsychologyAnswerListResultDTO; import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO; import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO; import com.elink.esua.epdc.modules.psychology.entity.PsychologyQuestionEntity; import org.apache.ibatis.annotations.Mapper; @@ -55,7 +56,7 @@ public interface PsychologyQuestionDao extends BaseDao * @author zhangyuan * @since 2020/5/21 14:54 */ - List listQuestion(PsychologyAnswerFormDTO dto); + List listAllQuestion(PsychologyAnswerFormDTO dto); /** * 工作端--待解答的心理咨询问题列表 @@ -67,4 +68,14 @@ public interface PsychologyQuestionDao extends BaseDao */ List listUnansweredQuestion(PsychologyUnansweredFormDTO dto); + /** + * 工作端--心理咨询-我回答的问题列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List listMyQuestion(PsychologyAnswerFormDTO dto); + } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java index 08ae99d..51b1a26 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java @@ -136,7 +136,7 @@ public interface PsychologistService extends BaseService { * @author zhangyuan * @date 2020-06-04 */ - List listQuestion(PsychologyAnswerFormDTO dto); + List listAllQuestion(PsychologyAnswerFormDTO dto); /** * 工作端--待解答的心理咨询问题列表 @@ -147,4 +147,14 @@ public interface PsychologistService extends BaseService { * @date 2020-06-04 */ List listUnansweredQuestion(PsychologyUnansweredFormDTO dto); + + /** + * 工作端--心理咨询-我回答的问题列表 + * + * @param dto + * @return List + * @author zhangyuan + * @date 2020-06-04 + */ + List listMyQuestion(PsychologyAnswerFormDTO 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 39e2c83..b016d12 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 @@ -36,7 +36,7 @@ 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.entity.PsychologyQuestionEntity; +import com.elink.esua.epdc.modules.psychology.entity.PsychologyAnswerEntity; import com.elink.esua.epdc.modules.psychology.redis.PsychologistRedis; import com.elink.esua.epdc.modules.psychology.service.PsychologistService; import org.apache.commons.lang3.StringUtils; @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 心理咨询师表 @@ -178,12 +179,12 @@ public class PsychologistServiceImpl extends BaseServiceImpl listQuestion(PsychologyAnswerFormDTO dto) { + public List listAllQuestion(PsychologyAnswerFormDTO dto) { // sql limit条件转换 dto.setPageIndex((dto.getPageIndex() - 1) * dto.getPageSize()); - List data = psychologyQuestionDao.listQuestion(dto); + List data = psychologyQuestionDao.listAllQuestion(dto); data.forEach(item -> { - List list = psychologyAnswerDao.listQuestion(item.getId()); + List list = psychologyAnswerDao.listAllQuestion(item.getId()); item.setAnswerList(list == null ? new ArrayList<>() : ConvertUtils.sourceToTarget(list, PsychologyAnswerInfoResultDTO.class)); }); @@ -197,4 +198,19 @@ public class PsychologistServiceImpl extends BaseServiceImpl listMyQuestion(PsychologyAnswerFormDTO dto) { + List questionIds = psychologyAnswerDao.listMyQuestion(dto.getUserId()).stream().map(PsychologyAnswerEntity::getId).collect(Collectors.toList()); + dto.setQuestionIds(questionIds); + // sql limit条件转换 + dto.setPageIndex((dto.getPageIndex() - 1) * dto.getPageSize()); + List data = psychologyQuestionDao.listMyQuestion(dto); + data.forEach(item -> { + List list = psychologyAnswerDao.listUserQuestion(item.getId()); + item.setAnswerList(list == null ? new ArrayList<>() : ConvertUtils.sourceToTarget(list, PsychologyAnswerUserInfoResultDTO.class)); + }); + + return data; + } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistTitleRelationServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistTitleRelationServiceImpl.java index 5873200..96f19be 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistTitleRelationServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistTitleRelationServiceImpl.java @@ -20,11 +20,11 @@ package com.elink.esua.epdc.modules.psychology.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.psychology.dao.PsychologistTitleRelationDao; import com.elink.esua.epdc.dto.psychology.PsychologistTitleRelationDTO; +import com.elink.esua.epdc.modules.psychology.dao.PsychologistTitleRelationDao; import com.elink.esua.epdc.modules.psychology.entity.PsychologistTitleRelationEntity; import com.elink.esua.epdc.modules.psychology.redis.PsychologistTitleRelationRedis; import com.elink.esua.epdc.modules.psychology.service.PsychologistTitleRelationService; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologyAnswerServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologyAnswerServiceImpl.java index 006d7cd..bac9727 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologyAnswerServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologyAnswerServiceImpl.java @@ -20,11 +20,11 @@ package com.elink.esua.epdc.modules.psychology.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.psychology.dao.PsychologyAnswerDao; import com.elink.esua.epdc.dto.psychology.PsychologyAnswerDTO; +import com.elink.esua.epdc.modules.psychology.dao.PsychologyAnswerDao; import com.elink.esua.epdc.modules.psychology.entity.PsychologyAnswerEntity; import com.elink.esua.epdc.modules.psychology.redis.PsychologyAnswerRedis; import com.elink.esua.epdc.modules.psychology.service.PsychologyAnswerService; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologyQuestionServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologyQuestionServiceImpl.java index 13594b9..ecc092f 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologyQuestionServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologyQuestionServiceImpl.java @@ -20,12 +20,12 @@ package com.elink.esua.epdc.modules.psychology.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dto.psychology.PsychologyQuestionDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO; import com.elink.esua.epdc.modules.psychology.dao.PsychologyQuestionDao; -import com.elink.esua.epdc.dto.psychology.PsychologyQuestionDTO; import com.elink.esua.epdc.modules.psychology.entity.PsychologyQuestionEntity; import com.elink.esua.epdc.modules.psychology.redis.PsychologyQuestionRedis; import com.elink.esua.epdc.modules.psychology.service.PsychologyQuestionService; diff --git a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml index 529340d..1bd84c1 100644 --- a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml @@ -34,7 +34,7 @@ CREATED_TIME DESC - SELECT PSYCHOLOGIST_ID, PSYCHOLOGIST_NAME, ANSWER_CONTENT FROM @@ -47,4 +47,14 @@ ORDER BY CREATED_TIME DESC + + \ 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 333295e..36be46e 100644 --- a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml @@ -39,7 +39,7 @@ LIMIT #{pageIndex}, #{pageSize}; - SELECT ID, USER_ID, USER_NAME, USER_AVATAR, QUESTION_CONTENT FROM @@ -70,4 +70,22 @@ CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize}; + + \ No newline at end of file