Aidea product update by Strive Date 2020-11-28

aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderSendOut.html

@@ -58,12 +58,12 @@
 
         <section class="content-header">
             <h1>
-                需求清单管理
-                <small>需求清单管理</small>
+                需求清单出库管理
+                <small>需求清单出库管理</small>
             </h1>
             <ol class="breadcrumb">
                 <li><a href="#"><i class="fa fa-dashboard"></i>首页</a></li>
-                <li><a class="active">需求清单管理</a></li>
+                <li><a class="active">需求清单出库管理</a></li>
             </ol>
         </section>
 

aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml

@@ -81,6 +81,7 @@
         <result column="cancel_time" property="cancelTime"/>
         <result column="sendExpressDateStr" property="sendExpressDateStr"/>
         <result column="acceptExpressDateStr" property="acceptExpressDateStr"/>
+        <result column="outTime" property="outTime"/>
         <collection property="list" ofType="com.cftech.order.model.ProductVO">
             <result column="product_name" property="productName"/>
         </collection>
@@ -326,14 +327,15 @@
             cs.consult_id consultCode,
             CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickName,
             o.address_id,
-            order_time,
-            cancel_time,
+            o.order_time,
+            o.cancel_time,
             DATE_FORMAT(aw.send_express_date, '%Y-%m-%d %H:%i') sendExpressDateStr,
             DATE_FORMAT(aw.accept_express_date, '%Y-%m-%d %H:%i') acceptExpressDateStr,
             t.id as productId,
             CONVERT ( AES_DECRYPT( m.`name`, 'aideakey' ) USING UTF8 ) memberName,
             CONVERT ( AES_DECRYPT( m.phone, 'aideakey' ) USING UTF8 ) memberPhone,
-            a.address
+            a.address,
+            DATE_FORMAT(aw.create_time, '%Y-%m-%d %H:%i') outTime
         FROM t_order o
         LEFT JOIN t_aidea_consult_sheet cs ON o.consult_id = cs.id
         LEFT JOIN t_shipping_address s ON o.address_id = s.id

aidea-modules/order-module/src/main/java/com/cftech/order/model/Order.java

@@ -144,6 +144,7 @@ public class Order extends OrderDetail implements Serializable {
     private String nickName;//患者昵称
     private String sendExpressDateStr;//发件时间
     private String acceptExpressDateStr;//签收时间
+    private String outTime;//出库时间