From 40e374a81bd95f067c20f4989821bf3554a8a3b7 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Sat, 16 Sep 2023 16:09:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E8=B4=A2=E5=8A=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/dto/QueryMerchantInfoDTO.java | 16 ++++++++++++++++
 .../mapper/pile/PileMerchantInfoMapper.xml     |  6 ++++++
 jsowell-ui/src/views/financial/merchant.vue    | 18 ++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java
index b859273f2..e13959d7f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMerchantInfoDTO.java
@@ -17,10 +17,26 @@ public class QueryMerchantInfoDTO {
 
     private Integer pageNum;
 
+    /**
+     * 运营商id
+     */
     private String merchantId;
 
+    /**
+     * 运营商名称
+     */
     private String merchantName;
 
+    /**
+     * 负责人名称
+     */
+    private String managerName;
+
+    /**
+     * 负责人手机号
+     */
+    private String managerPhone;
+
     private List<String> deptIds;
 
 }
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
index 871db2d15..d3b81efed 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
@@ -400,5 +400,11 @@
         <if test="dto.merchantId != null and dto.merchantId != ''">
             and t1.id = #{dto.merchantId,jdbcType=VARCHAR}
         </if>
+        <if test="dto.managerName != null and dto.managerName != ''">
+            and t1.manager_name = #{dto.managerName,jdbcType=VARCHAR}
+        </if>
+        <if test="dto.managerPhone != null and dto.managerPhone != ''">
+            and t1.manager_phone = #{dto.managerPhone,jdbcType=VARCHAR}
+        </if>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue
index cdaa7807d..013427a1d 100644
--- a/jsowell-ui/src/views/financial/merchant.vue
+++ b/jsowell-ui/src/views/financial/merchant.vue
@@ -18,6 +18,22 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="联系人名称" prop="managerName">
+        <el-input
+          v-model="queryParams.managerName"
+          placeholder="请输入联系人名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="管理员联系方式" prop="managerPhone">
+        <el-input
+          v-model="queryParams.managerPhone"
+          placeholder="请输入管理员联系方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -156,6 +172,8 @@ export default {
         pageSize: 10,
         merchantId: null,
         merchantName: null,
+        managerName: null,
+        managerPhone: null,
       },
     };
   },