zhijiezhao 3 年之前
父节点
当前提交
eeb4e9df48

+ 1 - 0
src/main/java/com/caimei365/user/mapper/ClubMapper.java

@@ -270,4 +270,5 @@ public interface ClubMapper {
 
     void concactVisit(RemarksVo remarksVo);
 
+    String findQuestionMan(String questionManId);
 }

+ 2 - 1
src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -799,10 +799,11 @@ public class ClubServiceImpl implements ClubService {
         visits.forEach(v -> {
             List<String> imageList = clubMapper.getVisitRemarksImageList(v.getRemarksId());
             List<RemarksFileVo> fileList = clubMapper.getVisitRemarksFileList(v.getRemarksId());
+            String questionMan = clubMapper.findQuestionMan(v.getQuestionManId());
             RemarksVo remarksVo = new RemarksVo();
             remarksVo.setRemarks(v.getRemarks());
             remarksVo.setClubId(Integer.valueOf(v.getClubId()));
-            remarksVo.setQuestionMan(v.getQuestionMan());
+            remarksVo.setQuestionMan(questionMan);
             remarksVo.setAddTime(v.getAddDate());
             remarksVo.setServiceProviderId(v.getServiceProviderId().toString());
             clubMapper.concactVisit(remarksVo);

+ 12 - 6
src/main/resources/mapper/ClubMapper.xml

@@ -30,9 +30,10 @@
         insert into cm_visitor_remarks_file(remarksId, fileType, fileName, ossName)
         values (#{remarksId}, 2, #{fileName}, #{ossName})
     </insert>
-    <insert id="concactVisit" parameterType="com.caimei365.user.model.vo.RemarksVo" keyProperty="remarksId" useGeneratedKeys="true">
-        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan,concactTime)
-        values (#{clubId}, #{serviceProviderId}, #{remarks}, #{addTime}, #{questionMan},now())
+    <insert id="concactVisit" parameterType="com.caimei365.user.model.vo.RemarksVo" keyProperty="remarksId"
+            useGeneratedKeys="true">
+        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan, concactTime)
+        values (#{clubId}, #{serviceProviderId}, #{remarks}, #{addTime}, #{questionMan}, now())
     </insert>
     <update id="updateClubUserByUpdateInfo">
         update user set
@@ -397,7 +398,7 @@
         ORDER BY ADDTIME DESC
     </select>
     <select id="findConcactVisit" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
-        select id as remarksId,
+        select id      as remarksId,
                questionManId,
                serviceProviderId,
                remarks,
@@ -407,7 +408,12 @@
                concactTime
         from cm_visitor_remarks
         where clubId = #{clubId}
-        and remarks is not null
+          and remarks is not null
+    </select>
+    <select id="findQuestionMan" resultType="java.lang.String">
+        select questionMan
+        from cm_visitor_remarks
+        where questionManId = #{questionManId}
+          AND questionMan IS NOT NULL
     </select>
-
 </mapper>