Merge branch 'feature/yujt_AppendP2' of http://121.42.41.42:7070/r/epdc-cloud-property-yushan into feature/yujt_AppendP2

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

@@ -28,7 +28,9 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.constant.PsychologyConstant;
 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.PsychologistDao;
 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.PsychologyQuestionEntity;
 import com.elink.esua.epdc.modules.psychology.redis.PsychologyQuestionRedis;
 import com.elink.esua.epdc.modules.psychology.service.PsychologyQuestionService;
@@ -50,8 +52,9 @@ import java.util.Map;
 @Service
 public class PsychologyQuestionServiceImpl extends BaseServiceImpl<PsychologyQuestionDao, PsychologyQuestionEntity> implements PsychologyQuestionService {
 
+
     @Autowired
-    private PsychologyQuestionRedis psychologyQuestionRedis;
+    private PsychologistDao psychologistDao;
 
     @Override
     public PageData<PsychologyQuestionDTO> page(Map<String, Object> params) {
@@ -94,6 +97,14 @@ public class PsychologyQuestionServiceImpl extends BaseServiceImpl<PsychologyQue
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveQuestion(PsychologyQuestionFormDTO dto) {
+        // 向指定咨询师提问
+        if (StringUtils.isNotBlank(dto.getPsychologistId())) {
+            PsychologistEntity psychologistEntity = psychologistDao.selectById(dto.getPsychologistId());
+            if (null != psychologistEntity) {
+                // 心理咨询问题表存储的 咨询师id=pc端用户id
+                dto.setPsychologistId(psychologistEntity.getUserId());
+            }
+        }
         if (YesOrNoEnum.YES.value().equals(dto.getAnonymousFlag())) {
             dto.setUserName(PsychologyConstant.PROPERTY_PSYCHOLOGY_ANONYMOUS_NAME);
             dto.setUserAvatar(PsychologyConstant.PROPERTY_PSYCHOLOGY_ANONYMOUS_AVATAR);

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

@@ -43,7 +43,7 @@
         <result property="id" column="ID"/>
         <result property="name" column="NAME"/>
         <result property="avatar" column="AVATAR"/>
-        <result property="motto" column="MOBILE"/>
+        <result property="motto" column="MOTTO"/>
         <result property="briefIntroduction" column="BRIEF_INTRODUCTION"/>
         <collection property="titleList" ofType="java.lang.String">
             <result column="TITLE" />

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

@@ -41,9 +41,9 @@
 
     <resultMap id="selectListAllQuestionsMap" type="com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO">
         <result property="id" column="ID" />
-        <result property="userId" column="ID" />
+        <result property="userId" column="USER_ID" />
-        <result property="userName" column="ID" />
+        <result property="userName" column="USER_NAME" />
-        <result property="userAvatar" column="ID" />
+        <result property="userAvatar" column="USER_AVATAR" />
         <result property="questionContent" column="QUESTION_CONTENT" />
         <collection property="answerList" ofType="com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerInfoResultDTO">
             <result property="psychologistId" column="PSYCHOLOGIST_ID" />