益寿缘-销售端-优化短信记录的展示逻辑

fs-company/src/main/java/com/fs/company/controller/company/CompanySmsLogsController.java

@@ -65,9 +65,8 @@ public class CompanySmsLogsController extends BaseController
         if (loginUser==null){
             throw new CustomException("请登录");
         }
-        startPage();
-        List<CompanySmsLogsQueryVO> list = companySmsLogsService.selectCompanySmsLogsListQueryYsytg(queryDTO);
-        return getDataTable(list);
+        List<CompanySmsLogsQueryVO> resultList = companySmsLogsService.selectCompanySmsLogsListQueryYsytg(queryDTO);
+        return getDataTable(resultList);
     }
 
     /**

fs-service/src/main/java/com/fs/company/dto/CompanySmsLogsQueryDTO.java

@@ -3,21 +3,24 @@ package com.fs.company.dto;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 短信日志查询DTO
  */
 @Data
-public class CompanySmsLogsQueryDTO {
+public class CompanySmsLogsQueryDTO{
     private Integer optionType;        // 类型：1-课程链接 2-获客
     private Long companyId;            // 公司ID
-    private Long companyUserId;        // 公司用户ID
+    private String companyUserName;      // 销售名称
     private String phone;              // 手机号
     private String tempCode;           // 模板编码
-    private Integer type;              // 短信类型
+    private String type;              // 短信服务商类型
+    private Integer status;            // 短信发送状态
     private Date beginCreateTime;      // 开始创建时间
     private Date endCreateTime;        // 结束创建时间
-    private Long courseId;             // 课程ID（课程链接类型）
-    private Long videoId;              // 视频ID（课程链接类型）
+    private Long courseId;             // 课程ID
+    private Long videoId;              // 视频ID
+
+    private Integer pageNum =1;
+    private Integer pageSize = 10;
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanySmsLogsServiceImpl.java

@@ -15,6 +15,7 @@ import com.fs.company.vo.CompanySmsLogsListQueryVO;
 import com.fs.company.vo.CompanySmsLogsListVO;
 import com.fs.company.vo.CompanySmsLogsQueryVO;
 import com.fs.company.vo.CompanySmsLogsStatisticsVO;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -136,6 +137,7 @@ public class CompanySmsLogsServiceImpl implements ICompanySmsLogsService
 
     @Override
     public List<CompanySmsLogsQueryVO> selectCompanySmsLogsListQueryYsytg(CompanySmsLogsQueryDTO queryDTO) {
+        PageHelper.startPage(queryDTO.getPageNum(), queryDTO.getPageSize());
         List<CompanySmsLogsQueryVO> resultList = companySmsLogsMapper.selectCompanySmsLogsListQueryYsytg(queryDTO);
         if (CollectionUtils.isEmpty(resultList)) {
             return Collections.emptyList();

fs-service/src/main/java/com/fs/company/vo/CompanySmsLogsQueryVO.java

@@ -1,7 +1,7 @@
 package com.fs.company.vo;
 
 import lombok.Data;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 
 /**
@@ -16,10 +16,15 @@ public class CompanySmsLogsQueryVO {
     private String tempCode;       // 模板编码
     private String phone;          // 手机号
     private String number;         // 发送号码
-    private Integer type;          // 类型
+    private Integer status;        // 短信发送状态
+    private String type;          // 类型
     private String content;        // 内容
     private String courseName;     // 课程名称（课程链接类型）
     private String videoTitle;     // 视频标题（课程链接类型）
-    private Date createTime;       // 创建时间
-    private Date sendTime;         // 发送时间
+    // 添加时间格式化注解
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sendTime;
 }

fs-service/src/main/resources/mapper/company/CompanySmsLogsMapper.xml

@@ -129,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) t
         GROUP BY t.type
     </select>
+
     <select id="selectCompanySmsLogsListQueryYsytg" resultType="com.fs.company.vo.CompanySmsLogsQueryVO">
         SELECT
         csl.logs_id AS logsId,
@@ -137,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         csl.temp_code AS tempCode,
         csl.phone AS phone,
         csl.number AS number,
+        csl.status AS status,
         csl.type AS type,
         csl.content AS content,
         <!-- 根据optionType动态选择关联字段 -->
@@ -171,8 +173,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.companyId != null">
                 AND csl.company_id = #{dto.companyId}
             </if>
-            <if test="dto.companyUserId != null">
-                AND csl.company_user_id = #{dto.companyUserId}
+            <if test="dto.status != null">
+                AND csl.status = #{dto.status}
+            </if>
+            <if test="dto.companyUserName != null and dto.companyUserName != ''">
+                AND cu.nick_name LIKE CONCAT('%', #{dto.companyUserName}, '%')
             </if>
             <if test="dto.phone != null and dto.phone != ''">
                 AND csl.phone LIKE CONCAT('%', #{dto.phone}, '%')
@@ -180,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.tempCode != null and dto.tempCode != ''">
                 AND csl.temp_code = #{dto.tempCode}
             </if>
-            <if test="dto.type != null">
+            <if test="dto.type != null and dto.type != ''">
                 AND csl.type = #{dto.type}
             </if>
             <if test="dto.beginCreateTime != null">
@@ -189,12 +194,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.endCreateTime != null">
                 AND csl.create_time &lt;= #{dto.endCreateTime}
             </if>
-            <if test="dto.userIds != null and dto.userIds.size() > 0">
-                AND csl.company_user_id IN
-                <foreach collection="dto.userIds" item="userId" open="(" separator="," close=")">
-                    #{userId}
-                </foreach>
-            </if>
             <!-- 课程链接类型特有查询条件 -->
             <if test="dto.optionType == 1">
                 <if test="dto.courseId != null">