From aaa4300122c220333376d0ca5a63534a20a541e1 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 21 十月 2022 16:56:11 +0800
Subject: [PATCH] 审核分页添加查询

---
 ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java                  |   27 +++++++++++++
 ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java |    5 +-
 ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java            |    5 ++
 ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml                |   51 +++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
index cab3fa0..8c3359c 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java
@@ -88,4 +88,31 @@
     @TableField("update_time")
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     private Date updateTime;
+
+
+    /**
+     * 瀹℃牳浜烘枃鏈�
+     */
+    @ApiModelProperty(value = "瀹℃牳浜烘枃鏈�")
+    @TableField(value = "audit_text",exist = false)
+    private String auditText;
+    /**
+     * 鏍囬
+     */
+    @ApiModelProperty(value = "鏍囬")
+    @TableField(value = "title",exist = false)
+    private String title;
+    /**
+     * 娑堟伅浣�
+     */
+    @ApiModelProperty(value = "娑堟伅浣�")
+    @TableField(value = "body",exist = false)
+    private String body;
+    /**
+     * 鍒涘缓浜烘枃鏈�
+     */
+    @ApiModelProperty(value = "鍒涘缓浜烘枃鏈�")
+    @TableField(value = "create_user_text",exist = false)
+    private String createUserText;
+
 }
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java
index ecdac2d..dfca7e6 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/message/SmsAuditMapper.java
@@ -1,7 +1,9 @@
 package com.ycl.mapper.message;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ycl.entity.message.SmsAudit;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -12,4 +14,7 @@
  * @since 2022-10-17
  */
 public interface SmsAuditMapper extends BaseMapper<SmsAudit> {
+
+
+    Page<SmsAudit> selectCondPage(Page<?> page,@Param("smsAudit") SmsAudit smsAudit);
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
index 916540e..d307642 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
@@ -33,7 +33,7 @@
     @Override
     public IPage<SmsAudit> list(SmsAudit smsAudit) {
         Page<SmsAudit> page = new Page<>(smsAudit.getCurrent(), smsAudit.getPageSize());
-        LambdaQueryWrapper<SmsAudit> queryWrapper = new LambdaQueryWrapper<>();
+        /*LambdaQueryWrapper<SmsAudit> queryWrapper = new LambdaQueryWrapper<>();
         if (smsAudit.getAuditId() != null) {
             queryWrapper.eq(SmsAudit::getAuditId, smsAudit.getAuditId());
         }
@@ -41,7 +41,8 @@
             queryWrapper.eq(SmsAudit::getAuditStatus, smsAudit.getAuditStatus());
         }
         queryWrapper.orderByDesc(SmsAudit::getCreateTime);
-        Page<SmsAudit> result = baseMapper.selectPage(page, queryWrapper);
+        Page<SmsAudit> result = baseMapper.selectPage(page, queryWrapper);*/
+        Page<SmsAudit> result = baseMapper.selectCondPage(page, smsAudit);
         return result;
     }
 
diff --git a/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml b/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml
new file mode 100644
index 0000000..4a4dff9
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/message/SmsAuditMapper.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.mapper.message.SmsAuditMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ycl.entity.message.SmsAudit">
+        <id column="id" property="id"/>
+        <result column="message_id" property="messageId"/>
+        <result column="audit_id" property="auditId"/>
+        <result column="audit_status" property="auditStatus"/>
+        <result column="audit_result" property="auditResult"/>
+        <result column="audit_opinion" property="auditOpinion"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+    <resultMap type="com.ycl.entity.message.SmsAudit" id="CondMapResultMap" extends="BaseResultMap">
+        <result column="audit_text" property="auditText"/>
+        <result column="title" property="title"/>
+        <result column="body" property="body"/>
+        <result column="create_user_text" property="createUserText"/>
+    </resultMap>
+
+    <select id="selectCondPage" parameterType="com.ycl.entity.message.SmsAudit" resultMap="CondMapResultMap">
+        SELECT
+            usa.*,
+            um.head title,
+            um.body,
+            ua.username audit_text,
+            ua2.username create_user_text
+        FROM
+            ums_sms_audit usa
+                LEFT JOIN ums_message um ON usa.message_id = um.id
+                LEFT JOIN ums_admin ua ON usa.audit_id = ua.id
+                LEFT JOIN ums_admin ua2 ON usa.create_user = ua2.id
+        where 1=1
+        <if test="smsAudit.auditId !=null and smsAudit.auditId >=0 ">
+            AND usa.audit_id = #{smsAudit.auditId}
+        </if>
+        <if test="smsAudit.messageId !=null and smsAudit.messageId >=0 ">
+            AND usa.message_id = #{smsAudit.messageId}
+        </if>
+        <if test="smsAudit.auditStatus !=null and smsAudit.auditStatus >= 0">
+            AND usa.audit_status = #{smsAudit.auditStatus}
+        </if>
+        ORDER BY
+            usa.create_time DESC
+    </select>
+
+</mapper>

--
Gitblit v1.8.0