Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/supervision/police/mapper/ConversationMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.police.domain.Conversation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.supervision.police.vo.ConversationResVo;
+import java.util.Date;
 
 /**
 * @author yaxin
@@ -14,7 +15,7 @@ import com.supervision.police.vo.ConversationResVo;
 */
 public interface ConversationMapper extends BaseMapper<Conversation> {
 
-    IPage<ConversationResVo> queryUserConversationList(String userId, Page<ConversationResVo> page);
+    IPage<ConversationResVo> queryUserConversationList(String userId, Date startTime,Date endTime, Page<ConversationResVo> page);
 }
 
 

src/main/java/com/supervision/police/service/ConversationService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.supervision.police.domain.Conversation;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.supervision.police.vo.ConversationResVo;
+import java.util.Date;
 
 /**
 * @author yaxin
@@ -13,6 +14,6 @@ import com.supervision.police.vo.ConversationResVo;
 */
 public interface ConversationService extends IService<Conversation> {
 
-    IPage<ConversationResVo> queryUserConversationList(String userId, Page<ConversationResVo> objectPage);
+    IPage<ConversationResVo> queryUserConversationList(String userId, Date startTime, Date endTime, Page<ConversationResVo> page);
 
 }

src/main/java/com/supervision/police/service/impl/ChatServiceImpl.java

@@ -1,6 +1,7 @@
 package com.supervision.police.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -18,7 +19,6 @@ import com.supervision.police.domain.ModelIndex;
 import com.supervision.police.dto.AnalyseCaseDTO;
 import com.supervision.police.dto.IndexDetail;
 import com.supervision.police.dto.IndexResultQuery;
-import com.supervision.police.dto.caseScore.CaseScoreDetailDTO;
 import com.supervision.police.service.*;
 import com.supervision.police.vo.ChatReqVO;
 import com.supervision.police.vo.ChatResVO;
@@ -211,7 +211,7 @@ public class ChatServiceImpl implements ChatService {
     public IPage<ConversationResVo> queryUserConversationList(String userId, int page, int size) {
         Assert.notEmpty(userId, "用户id不能为空");
 
-        return conversationService.queryUserConversationList(userId, new Page<>(page,size));
+        return conversationService.queryUserConversationList(userId, DateUtil.offsetDay(DateUtil.date(), -180),null, new Page<>(page,size));
     }
 
     @Override

src/main/java/com/supervision/police/service/impl/ConversationServiceImpl.java

@@ -9,6 +9,8 @@ import com.supervision.police.mapper.ConversationMapper;
 import com.supervision.police.vo.ConversationResVo;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
 * @author yaxin
 * @description 针对表【conversation(会话记录表)】的数据库操作Service实现
@@ -19,8 +21,8 @@ public class ConversationServiceImpl extends ServiceImpl<ConversationMapper, Con
     implements ConversationService{
 
     @Override
-    public IPage<ConversationResVo> queryUserConversationList(String userId, Page<ConversationResVo> page) {
+    public IPage<ConversationResVo> queryUserConversationList(String userId, Date startTime,Date endTime, Page<ConversationResVo> page) {
-        return super.getBaseMapper().queryUserConversationList(userId, page);
+        return super.getBaseMapper().queryUserConversationList(userId,startTime,endTime, page);
     }
 }
 

src/main/resources/mapper/ConversationMapper.xml

@@ -28,6 +28,17 @@
         from conversation c
                  left join model_case mc on c.case_id = mc.id
                  left join case_person cp on (c.case_id = cp.case_id and cp.case_actor_flag = 1 and cp.role_code = '1')
-        where c.user_id = #{userId} order by c.create_time desc
+            <where>
+                <if test="userId != null and userId != ''">
+                   and c.user_id = #{userId}
+                </if>
+            <if test="startTime != null">
+                and c.create_time >= #{startTime}
+            </if>
+            <if test="endTime !=null">
+                <![CDATA[and c.create_time <= #{endTime}]]>
+            </if>
+            </where>
+             order by c.create_time desc
     </select>
 </mapper>