完善了留言功能

src/main/java/org/rcisoft/app/appMemInfo/controller/AppMemInfoController.java

@@ -374,4 +374,16 @@ public class AppMemInfoController extends CyPaginationController<MemInfo> {
         return getGridModelResponse();
     }
 
+    /**
+     * 查询留言列表详情 1对1的
+     */
+    @CyOpeLogAnno(title = "system-会员表管理-查询留言表", businessType = CyLogTypeEnum.QUERY)
+    @Operation(summary="分页查询留言列表", description="分页查询留言列表")
+    @GetMapping(value = "/memInfo/leaveMessageDetailList")
+//    @CyEncryptSm4Anno
+    public CyGridModel leaveMessageDetailList(UserLeaveMessageDTO dto) {
+        IPage<MemInfo> userLeaveMessage = memInfoServiceImpl.leaveMessageDetailByPagination(getPaginationUtility(), dto);
+        return getGridModelResponse();
+    }
+
 }

src/main/java/org/rcisoft/business/memInfo/dao/MemInfoRepository.java

@@ -172,5 +172,10 @@ public interface MemInfoRepository extends CyBaseMapper<MemInfo> {
      * 分页查询留言
      */
     IPage<MemInfo> leaveMessageByPagination(CyPageInfo cyPageInfo,@Param("entity") UserLeaveMessageDTO dto);
+
+    /**
+     * 查询留言详情列表
+     */
+    IPage<MemInfo> leaveMessageDetailList(CyPageInfo cyPageInfo,@Param("entity") UserLeaveMessageDTO dto);
 }
 

src/main/java/org/rcisoft/business/memInfo/service/MemInfoService.java

@@ -112,4 +112,9 @@ public interface MemInfoService {
      * 分页查询留言列表
      */
     IPage<MemInfo> leaveMessageByPagination(CyPageInfo<MemInfo> paginationUtility, UserLeaveMessageDTO dto);
+
+    /**
+     * 查询留言列表详情 1对1的
+     */
+    IPage<MemInfo> leaveMessageDetailByPagination(CyPageInfo<MemInfo> paginationUtility, UserLeaveMessageDTO dto);
 }

src/main/java/org/rcisoft/business/memInfo/service/impl/MemInfoServiceImpl.java

@@ -702,4 +702,16 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         IPage<MemInfo> userLeaveMessageIPage = memInfoRepository.leaveMessageByPagination(paginationUtility, dto);
         return userLeaveMessageIPage;
     }
+
+    /**
+     * 查询留言列表详情 1对1的
+     * @param paginationUtility
+     * @param dto
+     */
+    @Override
+    public IPage<MemInfo> leaveMessageDetailByPagination(CyPageInfo<MemInfo> paginationUtility, UserLeaveMessageDTO dto) {
+        dto.setUserId(Integer.valueOf(CyUserUtil.getAuthenBusinessId()));
+        IPage<MemInfo> userLeaveMessageIPage = memInfoRepository.leaveMessageDetailList(paginationUtility, dto);
+        return userLeaveMessageIPage;
+    }
 }

src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml

@@ -626,13 +626,31 @@
             mi.avatar,
             mi.mem_nick_name
      FROM opm_user_leave_message oulm
-     LEFT JOIN mem_info mi ON mi.user_id = oulm.create_by
+     LEFT JOIN mem_info mi ON mi.user_id = oulm.target_id
      WHERE oulm.create_by = #{entity.userId}
        AND oulm.create_date = (
          SELECT MAX(oulm2.create_date)
          FROM opm_user_leave_message oulm2
          WHERE oulm2.target_id = oulm.target_id
            AND oulm2.create_by = #{entity.userId}
-     )
+       )
+    order by oulm.create_date desc
+    </select>
+    <select id="leaveMessageDetailList" resultType="org.rcisoft.business.memInfo.entity.MemInfo">
+        select
+            oulm.business_id,
+            oulm.content as leaveMessageContent,
+            oulm.del_status,
+            oulm.create_date,
+            oulm.create_by as userId,
+            oulm.target_id,
+            mi.avatar,
+            mi.mem_nick_name
+        from opm_user_leave_message oulm
+            LEFT JOIN mem_info mi ON mi.user_id = oulm.create_by
+        WHERE
+           (oulm.create_by = #{entity.userId} and oulm.target_id = #{entity.targetId})
+           OR (oulm.create_by = #{entity.targetId} and oulm.target_id = #{entity.userId})
+        ORDER BY create_date asc
     </select>
 </mapper>