From ce9088df9941a2edf924b7f06e117dfaa599a5e8 Mon Sep 17 00:00:00 2001
From: little-cat-sweet <2116400472@qq.com>
Date: Wed, 4 Aug 2021 16:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90sms=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhpc/general/controller/XhpcSmsController.java    |  2 +-
 .../java/com/xhpc/general/mapper/XhpcSmsMapper.java   |  2 +-
 .../com/xhpc/general/service/IXhpcSmsService.java     |  2 +-
 .../com/xhpc/general/service/XhpcSmsServiceImpl.java  |  8 ++++----
 .../src/main/resources/mapper/XhpcSmsMapper.xml       | 11 ++++++++++-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java
index 7102c875..767e3aa4 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java
@@ -36,7 +36,7 @@ public class XhpcSmsController extends BaseController {
     @GetMapping(value = "/getList")
     public TableDataInfo getList(Integer status, String phone){
         startPage();
-        List<Map<String, Object>> list = xhpcSmsService.getList();
+        List<Map<String, Object>> list = xhpcSmsService.getList(status, phone);
         return getDataTable(list);
     }
 
diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcSmsMapper.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcSmsMapper.java
index aa21ea19..2fe05bde 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcSmsMapper.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/mapper/XhpcSmsMapper.java
@@ -15,5 +15,5 @@ public interface XhpcSmsMapper {
     int addXhpcSms(XhpcSms xhpcSms);
 
 
-    List<Map<String,Object>> getList();
+    List<Map<String,Object>> getList(@Param("status") Integer status,@Param("phone") String phone);
 }
diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcSmsService.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcSmsService.java
index 1d271be7..dba33d87 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcSmsService.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcSmsService.java
@@ -19,5 +19,5 @@ public interface IXhpcSmsService {
      */
     AjaxResult getLogonPhoneCode(String phone);
 
-    List<Map<String, Object>> getList();
+    List<Map<String, Object>> getList(Integer status,String phone);
 }
diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java
index 71e1e07d..6fbf24cd 100644
--- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java
+++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcSmsServiceImpl.java
@@ -94,12 +94,12 @@ public class XhpcSmsServiceImpl implements IXhpcSmsService{
    }
 
    @Override
-   public List<Map<String, Object>> getList() {
-      return xhpcSmsMapper.getList();
+   public List<Map<String, Object>> getList(Integer status, String phone) {
+
+      return xhpcSmsMapper.getList(status,phone);
    }
 
-
-   private static HashMap<String, String> assembleSmsReq(String phone,String content) {
+   private static HashMap<String, String> assembleSmsReq(String phone, String content) {
       HashMap<String, String> params = new HashMap<>();
       params.put("account", ACCOUNT);
       params.put("password", PASSWD);
diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml
index d284a1b7..c703459c 100644
--- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml
+++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcSmsMapper.xml
@@ -95,8 +95,17 @@
 
     <select id="getList" resultType="map">
         select
-           *
+           phone,
+           content,
+           status,
+           create_time as createTime
         from xhpc_sms
         where del_flag=0
+        <if test="null!=status">
+            and status=#{status}
+        </if>
+        <if test="null!=phone and ''!=phone">
+            and phone like concat('%',#{phone},'%')
+        </if>
     </select>
 </mapper>