From e2db5f18940a8995732c410bafa2588e13da99e8 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Thu, 19 Oct 2017 08:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E4=BA=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/unlcn/ils/sales/backend/bo/OrderViewBO.java    | 10 ++++++++++
 .../com/unlcn/ils/sales/base/model/OrderViewDAO.java   | 10 ++++++++++
 .../src/main/resources/mappers/SaleOrderViewMapper.xml |  3 +++
 .../java/com/unlcn/ils/sales/web/vo/OrderViewVO.java   | 10 ++++++++++
 .../main/webapp/WEB-INF/webpage/network/order-list.jsp |  2 ++
 5 files changed, 35 insertions(+)

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java
index 128f0b2..a073f1b 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java
@@ -44,6 +44,7 @@ public class OrderViewBO {
     private String destPhone;
     private BigDecimal distance;
     private Date gmtCreate;
+    private String realName;
 
     // 销售订单商品车表
     private List<OrderSkuBO> orderSkus;
@@ -298,6 +299,14 @@ public class OrderViewBO {
         this.payStatus = payStatus;
     }
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     @Override
     public String toString() {
         return "OrderViewBO{" +
@@ -330,6 +339,7 @@ public class OrderViewBO {
                 ", destPhone='" + destPhone + '\'' +
                 ", distance=" + distance +
                 ", gmtCreate=" + gmtCreate +
+                ", realName='" + realName + '\'' +
                 ", orderSkus=" + orderSkus +
                 ", attachs=" + attachs +
                 '}';
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
index 1e41439..e84894b 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
@@ -44,6 +44,7 @@ public class OrderViewDAO {
     private String destContact;
     private String destPhone;
     private BigDecimal distance;
+    private String realName;
 
     // 销售订单商品车表
     private List<OrderSkuViewDAO> orderSkus;
@@ -419,6 +420,14 @@ public class OrderViewDAO {
         this.payStatus = payStatus;
     }
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     @Override
     public String toString() {
         return "OrderViewDAO{" +
@@ -453,6 +462,7 @@ public class OrderViewDAO {
                 ", destContact='" + destContact + '\'' +
                 ", destPhone='" + destPhone + '\'' +
                 ", distance=" + distance +
+                ", realName='" + realName + '\'' +
                 ", orderSkus=" + orderSkus +
                 ", attachs=" + attachs +
                 ", isTicket=" + isTicket +
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
index 584218d..148d72e 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
@@ -3,6 +3,7 @@
 <mapper namespace="com.unlcn.ils.sales.base.mapper.SaleOrderViewMapper">
     <resultMap id="BaseResultMap" type="com.unlcn.ils.sales.base.model.OrderViewDAO">
         <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="realName" property="realName" jdbcType="VARCHAR"/>
         <result column="code" property="code" jdbcType="VARCHAR"/>
         <result column="userId" property="userId" jdbcType="INTEGER"/>
         <result column="pickDate" property="pickDate" jdbcType="DATE"/>
@@ -49,6 +50,7 @@
     <select id="listSaleOrder" resultMap="BaseResultMap">
         SELECT
         so.id AS id,
+        sue.real_name AS realName,
         so.`code` AS code,
         so.brands AS brands,
         so.user_id AS userId,
@@ -91,6 +93,7 @@
         sale_order so
         LEFT JOIN sale_order_addr soa ON so.id = soa.sale_order_id
         LEFT JOIN sale_order_audit soau ON so.id = soau.sale_order_id
+        LEFT JOIN sale_user_ext sue ON so.user_id = sue.sale_user_id
         <where>
             so.delete_mark = 1
             AND soa.delete_mark = 1
diff --git a/ils-sales-web/src/main/java/com/unlcn/ils/sales/web/vo/OrderViewVO.java b/ils-sales-web/src/main/java/com/unlcn/ils/sales/web/vo/OrderViewVO.java
index 3386054..fcff330 100644
--- a/ils-sales-web/src/main/java/com/unlcn/ils/sales/web/vo/OrderViewVO.java
+++ b/ils-sales-web/src/main/java/com/unlcn/ils/sales/web/vo/OrderViewVO.java
@@ -39,6 +39,7 @@ public class OrderViewVO {
     private String destContact;
     private String destPhone;
     private BigDecimal distance;
+    private String realName;
 
     // 销售订单商品车表
     private List<OrderSkuBO> orderSkus;
@@ -259,6 +260,14 @@ public class OrderViewVO {
         this.orderAuditStatusText = orderAuditStatusText;
     }
 
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
     @Override
     public String toString() {
         return "OrderViewVO{" +
@@ -288,6 +297,7 @@ public class OrderViewVO {
                 ", destContact='" + destContact + '\'' +
                 ", destPhone='" + destPhone + '\'' +
                 ", distance=" + distance +
+                ", realName='" + realName + '\'' +
                 ", orderSkus=" + orderSkus +
                 '}';
     }
diff --git a/ils-sales-web/src/main/webapp/WEB-INF/webpage/network/order-list.jsp b/ils-sales-web/src/main/webapp/WEB-INF/webpage/network/order-list.jsp
index dfa3e01..a262865 100644
--- a/ils-sales-web/src/main/webapp/WEB-INF/webpage/network/order-list.jsp
+++ b/ils-sales-web/src/main/webapp/WEB-INF/webpage/network/order-list.jsp
@@ -116,6 +116,7 @@
                 <th>建议售价</th>
                 <th>提车时间</th>
                 <th>审批状态</th>
+                <th>下单人</th>
                 <th>详情</th>
             </tr>
             </thead>
@@ -145,6 +146,7 @@
         <td>{{ item.suggestSalePrice }}</td>
         <td>{{ item.pickDate }}</td>
         <td>{{ item.orderAuditStatusText }}</td>
+        <td>{{ item.realName }}</td>
         <td>
             <a href="javascript:;" data-id="{{ item.id }}" data-name="{{ item.id }}" data-opt="edit" class="layui-btn layui-btn-mini">查看</a>
         </td>
-- 
Gitee