From 66ddac67308deb403af427047192713eacf08bd8 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Mon, 18 Sep 2023 10:48:39 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9B=B4=E5=A4=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/dto/QueryStationDTO.java | 15 +++++++
 .../jsowell/pile/vo/web/PileStationVO.java    | 10 +++++
 .../mapper/pile/PileStationInfoMapper.xml     | 11 +++++
 jsowell-ui/src/views/pile/station/index.vue   | 45 ++++++++++++++++++-
 4 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java
index 66f10db61..8cea6c6c6 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java
@@ -46,6 +46,21 @@ public class QueryStationDTO extends BaseEntity {
      */
     private String merchantId;
 
+    /**
+     * 站点管理员名称
+     */
+    private String stationAdminName;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 管理员电话
+     */
+    private String stationTel;
+
     /**
      * 站点经度
      */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
index db4772adc..7191cc85f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
@@ -79,6 +79,16 @@ public class PileStationVO {
      */
     private String merchantAdminName;
 
+    /**
+     * 管理员电话
+     */
+    private String managerPhone;
+
+    /**
+     * 站点管理员
+     */
+    private String stationAdminName;
+
     /**
      * 站点状态
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
index 026886283..c7bd63ffa 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
@@ -319,7 +319,9 @@
             t1.pictures as pictures,
             t2.merchant_id as merchantId,
             t3.merchant_name as merchantName,
+            t1.station_admin_name as stationAdminName,
             t3.manager_name as merchantAdminName,
+            t3.manager_phone as managerPhone,
             t1.station_tel as stationTel,
             t1.match_cars as matchCars,
             t1.station_lng as stationLng,
@@ -351,6 +353,15 @@
             <if test="stationDTO.merchantId != null and stationDTO.merchantId != ''">
                 and t1.merchant_id = #{stationDTO.merchantId,jdbcType=VARCHAR}
             </if>
+        <if test="stationDTO.stationAdminName != null and stationDTO.stationAdminName != ''">
+            and t1.station_admin_name = #{stationDTO.stationAdminName,jdbcType=VARCHAR}
+        </if>
+        <if test="stationDTO.address != null and stationDTO.address != ''">
+            and t1.address like concat('%', #{stationDTO.address,jdbcType=VARCHAR}, '%')
+        </if>
+        <if test="stationDTO.stationTel != null and stationDTO.stationTel != ''">
+            and t1.station_tel = #{stationDTO.stationTel,jdbcType=VARCHAR}
+        </if>
             <!-- 数据范围过滤 -->
             <if test="stationDTO.merchantDeptIds != null and stationDTO.merchantDeptIds.size() != 0">
                 and t3.dept_id in
diff --git a/jsowell-ui/src/views/pile/station/index.vue b/jsowell-ui/src/views/pile/station/index.vue
index 218f07631..449dbb181 100644
--- a/jsowell-ui/src/views/pile/station/index.vue
+++ b/jsowell-ui/src/views/pile/station/index.vue
@@ -26,6 +26,34 @@
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
+
+          <el-form-item label="管理员姓名" prop="stationAdminName" label-width="90px">
+            <el-input
+              v-model="queryParams.stationAdminName"
+              placeholder="请输入站点管理员姓名"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="站点地址" prop="address">
+            <el-input
+              v-model="queryParams.address"
+              placeholder="请输入站点地址"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="站点电话" prop="stationTel">
+            <el-input
+              v-model="queryParams.stationTel"
+              placeholder="请输入站点电话"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
             <el-form-item>
                 <el-button
                     type="primary"
@@ -178,7 +206,8 @@
                     </el-switch>
                 </template>
             </el-table-column>
-            <el-table-column label="管理员" align="center" prop="merchantAdminName"/>
+          <el-table-column label="管理员" align="center" prop="stationAdminName" :formatter="stationAdminNameFormat"/>
+          <el-table-column label="站点电话" align="center" prop="stationTel" :formatter="stationTelFormat"/>
 
             <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
@@ -238,7 +267,7 @@
                     <el-input v-model="form.address" maxlength="30" placeholder="请输入站点地址"/>
                 </el-form-item>
 
-                <el-form-item label="站点管理员" prop="merchantAdminName">
+                <el-form-item label="站点管理员" prop="stationAdminName">
                     <el-input v-model="form.stationAdminName" placeholder="站点管理员"/>
                 </el-form-item>
 
@@ -300,6 +329,7 @@ export default {
                 aloneApply: null,
                 accountNumber: null,
                 capacity: null,
+                stationAdminName: null,
                 publicParking: null,
                 parkingNumber: null,
                 countryCode: null,
@@ -373,6 +403,14 @@ export default {
                 console.log("merchantList", this.merchantList)
             });
         },
+      // 格式化站点管理员显示
+      stationAdminNameFormat(row) {
+        return row.stationAdminName == null ? row.merchantAdminName : row.stationAdminName;
+      },
+      // 格式化站点电话显示
+      stationTelFormat(row) {
+        return row.stationTel == null ? row.managerPhone : row.stationTel;
+      },
         changeStationFlag(info) {
           console.log(info);
           updateStation(info).then((response) => {
@@ -438,7 +476,9 @@ export default {
         /** 查询充电站信息列表 */
         getList() {
             this.loading = true;
+            console.log("queryParams", this.queryParams)
             listStation(this.queryParams).then((response) => {
+              console.log("response", response)
                 this.stationList = response.rows;
                 this.total = response.total;
                 this.loading = false;
@@ -458,6 +498,7 @@ export default {
                 aloneApply: null,
                 accountNumber: null,
                 capacity: null,
+                stationAdminName: null,
                 publicParking: null,
                 parkingNumber: null,
                 countryCode: null,