From faa22742afc713379305cfb5f8af2868a6ed49b1 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Fri, 15 Sep 2017 14:51:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
index 246f16a..36298da 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
@@ -9,6 +9,7 @@ import com.unlcn.ils.sales.backend.bo.OrderToKyleBO;
 import com.unlcn.ils.sales.backend.bo.PriceBO;
 import com.unlcn.ils.sales.backend.constant.AutoConfConstant;
 import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum;
+import com.unlcn.ils.sales.backend.util.DateUtils;
 import com.unlcn.ils.sales.base.mapper.SaleOrderAuditMapper;
 import com.unlcn.ils.sales.base.mapper.SaleOrderViewMapper;
 import com.unlcn.ils.sales.base.model.OrderViewDAO;
@@ -154,7 +155,7 @@ public class OrderAuditServiceImpl implements OrderAuditService {
                bo.setDestRegionName(val.getDestRegionName());
                bo.setDestContact(val.getDestContact());
                bo.setDestPhone(val.getDestPhone());
-               bo.setPickDate(val.getPickDate().toString());
+               bo.setPickDate(DateUtils.getStringFromDate(val.getPickDate(), "yyyy-MM-dd"));
                bo.setBrands(val.getBrands());
                bo.setSeriesAmt(val.getSeriesAmt());
                bo.setDistance(val.getDistance().toString());
-- 
Gitee


From ff8b9e00d19e2a20878fea71533a0d9c89657824 Mon Sep 17 00:00:00 2001
From: Quzf <felix.quzf@gmail.com>
Date: Fri, 15 Sep 2017 16:50:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E5=95=86=E5=93=81=E8=BD=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/SaleOrderViewMapper.xml | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
index c1ca3ba..deb6ee5 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
@@ -40,7 +40,7 @@
         <result column="pick_time" property="pickTime" jdbcType="VARCHAR"/>
         <result column="payStatus" property="payStatus" jdbcType="INTEGER"/>
         <collection property="orderSkus" column="id" ofType="com.unlcn.ils.sales.base.model.OrderSkuViewDAO"
-                    javaType="ArrayList" select="listSaleOrderSku"/>
+                    javaType="ArrayList" select="saleOrderSkus"/>
         <collection property="attachs" column="id" ofType="com.unlcn.ils.sales.base.model.OrderAttachViewDAO"
                     javaType="ArrayList" select="listOrderAttach"/>
     </resultMap>
@@ -202,8 +202,7 @@
     </resultMap>
 
     <select id="listSaleOrderSku" resultMap="SaleOrderSkuMap">
-    SELECT *,count(*) as amt FROM(
-    SELECT
+    SELECT  DISTINCT
             sos.brand_id AS brandId,
             sos.brand_code AS brandCode,
             sos.brand_name AS brandName,
@@ -212,15 +211,35 @@
             sos.series_name AS seriesName,
             sos.model_id AS modelId,
             sos.model_code AS modelCode,
-            sos.model_name AS modelName
+            sos.model_name AS modelName,
+            sos.amt AS amt
         FROM
             sale_order_sku sos
         WHERE
             sos.delete_mark = 1
-        AND sos.sale_order_id = #{id}) t
-    GROUP BY t.brandId,t.brandCode,t.brandName,t.modelCode,t.modelId,t.modelName,t.seriesCode,t.seriesId,t.seriesName
+        AND sos.sale_order_id = #{id}
   </select>
 
+    <select id="saleOrderSkus" resultMap="SaleOrderSkuMap">
+        SELECT
+        sos.brand_id AS brandId,
+        sos.brand_code AS brandCode,
+        sos.brand_name AS brandName,
+        sos.series_id AS seriesId,
+        sos.series_code AS seriesCode,
+        sos.series_name AS seriesName,
+        sos.model_id AS modelId,
+        sos.model_code AS modelCode,
+        sos.model_name AS modelName,
+        sos.amt AS amt,
+        sos.vin AS vin
+        FROM
+        sale_order_sku sos
+        WHERE
+        sos.delete_mark = 1
+        AND sos.sale_order_id = #{id}
+    </select>
+
   <select id="listOrderAttach" resultMap="SaleOrderAttachMap">
     SELECT
         soa.id AS id,
-- 
Gitee