From 399e1cdc27d0a8cf029e47fff5c96cf30564ce88 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Tue, 29 Aug 2023 17:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=A4=A7=E5=A0=86=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/system/ClewController.java |  53 +++++++
 .../web/controller/tool/NoticeController.java |   3 +-
 .../src/main/resources/application.yml        |   2 +-
 .../src/main/resources/templates/login.html   |   4 +-
 .../templates/system/clew/changeUser.html     |  30 ++++
 .../resources/templates/system/clew/clew.html | 146 +++++++-----------
 .../resources/templates/system/clew/edit.html |  67 +++-----
 .../templates/system/phone/phone.html         |   8 +
 .../java/com/ruoyi/system/domain/Clew.java    |   2 +
 .../com/ruoyi/system/domain/ClewPhone.java    |  32 +---
 .../resources/mapper/system/ClewMapper.xml    |   1 +
 .../mapper/system/ClewPhoneMapper.xml         |   4 +-
 12 files changed, 183 insertions(+), 169 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/clew/changeUser.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
index 5e5a1171..448fa52a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
@@ -1,6 +1,12 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.ClewPhone;
+import com.ruoyi.system.service.IClewPhoneService;
+import com.ruoyi.system.service.ISysUserService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -30,6 +36,12 @@ public class ClewController extends BaseController
     @Autowired
     private IClewService clewService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private IClewPhoneService clewPhoneService;
+
     @RequiresPermissions("system:clew:view")
     @GetMapping()
     public String clew()
@@ -46,7 +58,18 @@ public class ClewController extends BaseController
     public TableDataInfo list(Clew clew)
     {
         startPage();
+        if(!"admin".equals(getSysUser().getLoginName())){
+            clew.setSaleId(getSysUser().getUserId());
+        }
         List<Clew> list = clewService.selectClewList(clew);
+        list.forEach(model->{
+            if(model.getSaleId() != null){
+                SysUser user = sysUserService.selectUserById(model.getSaleId());
+                if(user != null){
+                    model.setSaleName(user.getUserName());
+                }
+            }
+        });
         return getDataTable(list);
     }
 
@@ -90,6 +113,20 @@ public class ClewController extends BaseController
     @ResponseBody
     public AjaxResult appAddSave(@RequestBody Clew clew)
     {
+        Clew param = new Clew();
+        param.setPhone(clew.getPhone());
+        List<Clew> result = clewService.selectClewList(param);
+        if (CollectionUtils.isNotEmpty(result)){
+            return AjaxResult.success();
+        }
+        // 将初始线索设置成已跟踪
+        ClewPhone model = new ClewPhone();
+        model.setPhone(clew.getPhone());
+        List<ClewPhone> clewPhoneList =  clewPhoneService.selectClewPhoneList(model);
+        clewPhoneList.forEach(x->{
+            x.setStatus("1");
+            clewPhoneService.updateClewPhone(x);
+        });
         return toAjax(clewService.insertClew(clew));
     }
 
@@ -128,4 +165,20 @@ public class ClewController extends BaseController
     {
         return toAjax(clewService.deleteClewByIds(ids));
     }
+
+    @PostMapping("/changeUser")
+    @ResponseBody
+    public AjaxResult changeUser(Clew clew)
+    {
+        return toAjax(clewService.updateClew(clew));
+    }
+
+    @GetMapping("/changeUser/{clewId}")
+    public String changeUser(@PathVariable("clewId") String id, ModelMap mmap)
+    {
+        mmap.put("clewId", id);
+        mmap.put("users", sysUserService.selectUserList(new SysUser()));
+        return "system/clew/changeUser";
+    }
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
index b814e983..28764a39 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/NoticeController.java
@@ -136,7 +136,8 @@ public class NoticeController {
                     clewPhoneService.insertClewPhone(model);
                 }
             }catch (Exception e){
-                log.error("手机号入库失败!");
+                e.printStackTrace();
+                log.error("手机号入库失败!,原因:{}", e.getMessage());
             }
 
         }catch (Exception e){
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 77e9adae..cda3c288 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -114,7 +114,7 @@ shiro:
     cipherKey: 
   session:
     # Session超时时间，-1代表永不过期（默认30分钟）
-    expireTime: 30
+    expireTime: 360
     # 同步session到数据库的周期（默认1分钟）
     dbSyncPeriod: 1
     # 相隔多久检查一次session的有效性，默认就是10分钟
diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 162d6463..4bb791c7 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -44,8 +44,8 @@
                 <form id="signupForm" autocomplete="off">
                     <h4 class="no-margins">登录：</h4>
                     <p class="m-t-md">你若不离不弃，我必生死相依</p>
-                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
-                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
+                    <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value=""    />
+                    <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="" />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
 						<div class="col-xs-6">
 						    <input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
diff --git a/ruoyi-admin/src/main/resources/templates/system/clew/changeUser.html b/ruoyi-admin/src/main/resources/templates/system/clew/changeUser.html
new file mode 100644
index 00000000..4f657c89
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/clew/changeUser.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+	<th:block th:include="include :: header('修改客服')" />
+</head>
+<body class="white-bg">
+	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+		<form class="form-horizontal m" id="form-change-user">
+			<input name="id"  type="hidden"  th:value="${clewId}" />
+			<div class="form-group">
+				<label class="col-sm-3 control-label">客服：</label>
+				<div class="col-sm-8">
+					<select id="saleId" name="saleId" class="form-control control-label" required>
+						<option th:each="user:${users}" th:value="${user.userId}" th:text="${user.userName}"></option>
+					</select>
+				</div>
+			</div>
+		</form>
+	</div>
+	<th:block th:include="include :: footer" />
+	<script type="text/javascript">
+		function submitHandler() {
+	        if ($.validate.form()) {
+	        	$.operate.save(ctx + "system/clew/changeUser", $('#form-change-user').serialize());
+	        }
+	    }
+	</script>
+</body>
+
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/clew/clew.html b/ruoyi-admin/src/main/resources/templates/system/clew/clew.html
index 9c136138..56b7283d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/clew/clew.html
+++ b/ruoyi-admin/src/main/resources/templates/system/clew/clew.html
@@ -10,74 +10,14 @@
             <form id="formId">
                 <div class="select-list">
                     <ul>
-                        <li>
-                            <label>广告主：</label>
-                            <input type="text" name="company"/>
-                        </li>
-                        <li>
-                            <label>销售：</label>
-                            <input type="text" name="saleId"/>
-                        </li>
-                        <li>
-                            <label>信息流：</label>
-                            <input type="text" name="infoFlow"/>
-                        </li>
-                        <li>
-                            <label>下次跟进日期：</label>
-                            <input type="text" class="time-input" placeholder="请选择下次跟进日期" name="nextTime"/>
-                        </li>
-                        <li>
-                            <label>微信昵称：</label>
-                            <input type="text" name="wxName"/>
-                        </li>
                         <li>
                             <label>手机号：</label>
                             <input type="text" name="phone"/>
                         </li>
-                        <li>
-                            <label>债务金额：</label>
-                            <input type="text" name="debtMoney"/>
-                        </li>
                         <li>
                             <label>App来源：</label>
                             <input type="text" name="sourceApp"/>
                         </li>
-                        <li>
-                            <label>微信号：</label>
-                            <input type="text" name="wxAccount"/>
-                        </li>
-                        <li>
-                            <label>客户评级：</label>
-                            <input type="text" name="customerLevel"/>
-                        </li>
-                        <li>
-                            <label>是否长按识别二维码：</label>
-                            <input type="text" name="touchQrcode"/>
-                        </li>
-                        <li>
-                            <label>跟进次数：</label>
-                            <input type="text" name="contactNumber"/>
-                        </li>
-                        <li>
-                            <label>是否触达：</label>
-                            <input type="text" name="isTouch"/>
-                        </li>
-                        <li>
-                            <label>是否加微：</label>
-                            <input type="text" name="isAddWx"/>
-                        </li>
-                        <li>
-                            <label>是否有效：</label>
-                            <input type="text" name="isEffective"/>
-                        </li>
-                        <li>
-                            <label>是否意向：</label>
-                            <input type="text" name="isPlan"/>
-                        </li>
-                        <li>
-                            <label>成交状态：</label>
-                            <input type="text" name="isDeal"/>
-                        </li>
                         <li>
                             <label>省份：</label>
                             <input type="text" name="provinceName"/>
@@ -86,18 +26,6 @@
                             <label>城市：</label>
                             <input type="text" name="cityName"/>
                         </li>
-                        <li>
-                            <label>姓名：</label>
-                            <input type="text" name="customerName"/>
-                        </li>
-                        <li>
-                            <label>方便接电话时间：</label>
-                            <input type="text" class="time-input" placeholder="请选择方便接电话时间" name="contactTime"/>
-                        </li>
-                        <li>
-                            <label>其他联系方式：</label>
-                            <input type="text" name="otherPhone"/>
-                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -130,6 +58,13 @@
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('system:clew:edit')}]];
     var removeFlag = [[${@permission.hasPermi('system:clew:remove')}]];
+
+    var isAddWx = [[${@dict.getType('is_add_wx')}]];
+    var isEffective = [[${@dict.getType('is_effective')}]];
+    var isPlan = [[${@dict.getType('is_plan')}]];
+    var isDeal = [[${@dict.getType('is_deal')}]];
+    var customerStatus = [[${@dict.getType('customer_status')}]];
+
     var prefix = ctx + "system/clew";
 
     $(function() {
@@ -154,15 +89,18 @@
                 },
                 {
                     field: 'customerName',
-                    title: '姓名'
+                    title: '姓名',
+                    visible: false
                 },
                 {
                     field: 'wxName',
-                    title: '微信昵称'
+                    title: '微信昵称',
+                    visible: false
                 },
                 {
                     field: 'wxAccount',
-                    title: '微信号'
+                    title: '微信号',
+                    visible: false
                 },
                 {
                     field: 'debtType',
@@ -182,47 +120,68 @@
                 },
                 {
                     field: 'sourceType',
-                    title: '推广来源'
+                    title: '推广来源',
+                    visible: false
                 },
                 {
                     field: 'customerStatus',
-                    title: '客户状态'
+                    title: '客户状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(customerStatus, value);
+                    }
                 },
                 {
                     field: 'customerLevel',
-                    title: '客户评级'
+                    title: '客户评级',
+                    visible: false
                 },
                 {
                     field: 'nextTime',
-                    title: '下次跟进日期'
+                    title: '下次跟进日期',
+                    visible: false
                 },
                 {
                     field: 'touchQrcode',
-                    title: '是否长按识别二维码'
+                    title: '是否长按识别二维码',
+                    visible: false
                 },
                 {
                     field: 'contactNumber',
-                    title: '跟进次数'
+                    title: '跟进次数',
+                    visible: false
                 },
                 {
                     field: 'isTouch',
-                    title: '是否触达'
+                    title: '是否触达',
+                    visible: false
                 },
                 {
                     field: 'isAddWx',
-                    title: '是否加微'
+                    title: '是否加微',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(isAddWx, value);
+                    }
                 },
                 {
                     field: 'isEffective',
-                    title: '是否有效'
+                    title: '是否有效',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(isEffective, value);
+                    }
                 },
                 {
                     field: 'isPlan',
-                    title: '是否意向'
+                    title: '是否意向',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(isPlan, value);
+                    }
                 },
                 {
                     field: 'isDeal',
-                    title: '成交状态'
+                    title: '成交状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(isDeal, value);
+                    }
                 },
                 {
                     field: 'provinceName',
@@ -242,21 +201,24 @@
                 },
                 {
                     field: 'company',
-                    title: '广告主'
+                    title: '广告主',
+                    visible: false
                 },
                 {
-                    field: 'saleId',
+                    field: 'saleName',
                     title: '销售'
                 },
                 {
                     field: 'infoFlow',
-                    title: '信息流'
+                    title: '信息流',
+                    visible: false
                 },
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="changeUser(\'' + row.id + '\')"><i class="fa fa-remove"></i>分配客服</a>');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
@@ -265,6 +227,12 @@
         };
         $.table.init(options);
     });
+
+    /* 选择供应商 */
+    function changeUser(clewId) {
+        var url = prefix + '/changeUser/' + clewId;
+        $.modal.open("选择客服", url, '800', '300');
+    }
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/clew/edit.html b/ruoyi-admin/src/main/resources/templates/system/clew/edit.html
index 04c32866..dc41c021 100644
--- a/ruoyi-admin/src/main/resources/templates/system/clew/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/clew/edit.html
@@ -8,24 +8,6 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-clew-edit" th:object="${clew}">
         <input name="id" th:field="*{id}" type="hidden">
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">广告主：</label>
-            <div class="col-sm-8">
-                <input name="company" th:field="*{company}" class="form-control" type="text" required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">销售：</label>
-            <div class="col-sm-8">
-                <input name="saleId" th:field="*{saleId}" class="form-control" type="text" required>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">信息流：</label>
-            <div class="col-sm-8">
-                <input name="infoFlow" th:field="*{infoFlow}" class="form-control" type="text" required>
-            </div>
-        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">下次跟进日期：</label>
             <div class="col-sm-8">
@@ -53,12 +35,6 @@
                 <input name="debtMoney" th:field="*{debtMoney}" class="form-control" type="text">
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">App来源：</label>
-            <div class="col-sm-8">
-                <input name="sourceApp" th:field="*{sourceApp}" class="form-control" type="text">
-            </div>
-        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">微信号：</label>
             <div class="col-sm-8">
@@ -70,47 +46,46 @@
             <div class="col-sm-8">
                 <input name="customerLevel" th:field="*{customerLevel}" class="form-control" type="text">
             </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">是否长按识别二维码 0.否 1.是：</label>
-            <div class="col-sm-8">
-                <input name="touchQrcode" th:field="*{touchQrcode}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
+        </div><div class="form-group">
             <label class="col-sm-3 control-label">跟进次数：</label>
             <div class="col-sm-8">
                 <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">是否触达 0.否 1.是：</label>
+            <label class="col-sm-3 control-label">加微：</label>
             <div class="col-sm-8">
-                <input name="isTouch" th:field="*{isTouch}" class="form-control" type="text">
+                <div class="radio-box" th:each="dict : ${@dict.getType('is_add_wx')}">
+                    <input type="radio" th:id="${dict.dictCode}" name="isAddWx" th:value="${dict.dictValue}" th:field="*{isAddWx}">
+                    <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                </div>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">是否加微 0.否 1.是：</label>
+            <label class="col-sm-3 control-label">是否有效：</label>
             <div class="col-sm-8">
-                <input name="isAddWx" th:field="*{isAddWx}" class="form-control" type="text">
+                <div class="radio-box" th:each="dict : ${@dict.getType('is_effective')}">
+                    <input type="radio" th:id="${dict.dictCode}" name="isEffective" th:value="${dict.dictValue}" th:field="*{isEffective}">
+                    <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                </div>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">是否有效 0.否 1.是：</label>
+            <label class="col-sm-3 control-label">意向：</label>
             <div class="col-sm-8">
-                <input name="isEffective" th:field="*{isEffective}" class="form-control" type="text">
+                <div class="radio-box" th:each="dict : ${@dict.getType('is_plan')}">
+                    <input type="radio" th:id="${dict.dictCode}" name="isPlan" th:value="${dict.dictValue}" th:field="*{isPlan}">
+                    <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                </div>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">是否意向 0.否 1.是：</label>
+            <label class="col-sm-3 control-label">成交状态：</label>
             <div class="col-sm-8">
-                <input name="isPlan" th:field="*{isPlan}" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">成交状态 0.未成交 1.已成交：</label>
-            <div class="col-sm-8">
-                <input name="isDeal" th:field="*{isDeal}" class="form-control" type="text">
+                <div class="radio-box" th:each="dict : ${@dict.getType('is_deal')}">
+                    <input type="radio" th:id="${dict.dictCode}" name="isDeal" th:value="${dict.dictValue}" th:field="*{isDeal}">
+                    <label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                </div>
             </div>
         </div>
         <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/system/phone/phone.html b/ruoyi-admin/src/main/resources/templates/system/phone/phone.html
index 76a73aeb..3fc10db9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/phone/phone.html
+++ b/ruoyi-admin/src/main/resources/templates/system/phone/phone.html
@@ -46,6 +46,8 @@
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('system:phone:edit')}]];
     var removeFlag = [[${@permission.hasPermi('system:phone:remove')}]];
+
+    var phoneStatus = [[${@dict.getType('phone_status')}]];
     var prefix = ctx + "system/phone";
 
     $(function() {
@@ -67,6 +69,12 @@
                 {
                     field: 'phone',
                     title: '手机号'
+                },{
+                    field: 'status',
+                    title: '状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(phoneStatus, value);
+                    }
                 },
                 {
                     field: 'createTime',
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java
index 330398e6..feb6cea1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java
@@ -28,6 +28,8 @@ public class Clew extends BaseEntity
     @Excel(name = "销售")
     private Long saleId;
 
+    private String saleName;
+
     /** 信息流 */
     @Excel(name = "信息流")
     private String infoFlow;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ClewPhone.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ClewPhone.java
index e37982b5..c701552a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ClewPhone.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ClewPhone.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-07-19
  */
+@Data
 public class ClewPhone extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -22,35 +24,7 @@ public class ClewPhone extends BaseEntity
     @Excel(name = "手机号")
     private String phone;
 
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
 
-    public Long getId()
-    {
-        return id;
-    }
-    public void setPhone(String phone)
-    {
-        this.phone = phone;
-    }
+    private String status;
 
-    public String getPhone()
-    {
-        return phone;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("phone", getPhone())
-                .append("createTime", getCreateTime())
-                .append("createBy", getCreateBy())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
index ccaf2b03..7b9b6250 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
@@ -71,6 +71,7 @@
             <if test="contactTime != null "> and contact_time = #{contactTime}</if>
             <if test="otherPhone != null  and otherPhone != ''"> and other_phone = #{otherPhone}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectClewById" parameterType="Long" resultMap="ClewResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/ClewPhoneMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ClewPhoneMapper.xml
index 4664f855..96a018c2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ClewPhoneMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ClewPhoneMapper.xml
@@ -7,6 +7,7 @@
     <resultMap type="ClewPhone" id="ClewPhoneResult">
         <result property="id"    column="id"    />
         <result property="phone"    column="phone"    />
+        <result property="status"    column="status"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
@@ -15,7 +16,7 @@
     </resultMap>
 
     <sql id="selectClewPhoneVo">
-        select id, phone, create_time, create_by, update_by, update_time, remark from clew_phone
+        select id, phone,status, create_time, create_by, update_by, update_time, remark from clew_phone
     </sql>
 
     <select id="selectClewPhoneList" parameterType="ClewPhone" resultMap="ClewPhoneResult">
@@ -54,6 +55,7 @@
         update clew_phone
         <trim prefix="SET" suffixOverrides=",">
             <if test="phone != null">phone = #{phone},</if>
+            <if test="status != null">status = #{status},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>