feat：投诉类型添加搜索条件

fs-service/src/main/java/com/fs/course/domain/FsUserCourseComplaintRecord.java

@@ -1,12 +1,15 @@
 package com.fs.course.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 看课投诉记录对象 fs_user_course_complaint_record
  *
@@ -25,9 +28,21 @@ public class FsUserCourseComplaintRecord extends BaseEntity{
     @TableField(exist = false)
     private Integer pageSize = 10;
 
-    @ApiModelProperty(value = "用户昵称")
+    //    @ApiModelProperty(value = "用户昵称")
+//    @TableField(exist = false)
+//    private String nickName;
+
+    @ApiModelProperty(value = "投诉类型")
+    @TableField(exist = false)
+    private String complaintTypeName;
+
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startCreateTime;
+
     @TableField(exist = false)
-    private String nickName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endCreateTime;
 
     /** 投诉记录id */
     private Long recordId;

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseComplaintRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.course.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -55,6 +56,9 @@ public class FsUserCourseComplaintRecordServiceImpl extends ServiceImpl<FsUserCo
 
         // 获取外部联系人看课状态
         List<Long> userIds = list.stream().map(FsUserCourseComplaintRecordPageListVO::getUserId).collect(Collectors.toList());
+        if(userIds.isEmpty()){
+            return Collections.emptyList();
+        }
         List<QwExternalContact> qwExternalContacts = qwExternalContactMapper.selectExternalByFsUserIds(userIds);
         Map<Long, QwExternalContact> qwExternalContactMap = qwExternalContacts.stream().collect(Collectors.toMap(QwExternalContact::getFsUserId, Function.identity(), (v1, v2) -> v1));
 

fs-service/src/main/resources/mapper/course/FsUserCourseComplaintRecordMapper.xml

@@ -46,8 +46,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN fs_user ON fs_user.user_id = cr.user_id
 --         left join qw_external_contact ec on cr.user_id = ec.fs_user_id
         <where>
-            <if test="nickName != null and nickName != '' ">
-                and fs_user.nick_name like concat('%', #{nickName}, '%')
+            <if test="userId != null">
+                and cr.user_id like concat('%', #{userId}, '%')
+            </if>
+            <if test="complaintTypeName != null and complaintTypeName != '' ">
+                and ct.complaint_type_name like concat('%', #{complaintTypeName}, '%')
+            </if>
+            <if test = "startCreateTime != null and endCreateTime != null" >
+                AND (DATE_FORMAT( cr.create_time, "%Y-%m-%d" ) &gt;= DATE_FORMAT(#{startCreateTime}, "%Y-%m-%d")
+                and DATE_FORMAT( cr.create_time, "%Y-%m-%d" ) &lt;= DATE_FORMAT(#{endCreateTime}, "%Y-%m-%d")
+                )
             </if>
         </where>
     </select>