Merge remote-tracking branch 'origin/test' into test

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

@@ -22,6 +22,8 @@ import java.util.List;
 public class CarrierOrderChildDetailVO {
 
 
+    @ApiModelProperty(value = "订单编号", example = "100000000")
+    private String orderNo;
     @ApiModelProperty(value = "运单编号", example = "100000000")
     private String childNo;
 

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -2583,8 +2583,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         fieldList.add(new ExcelField(18, "发货地址", "sendAddress", 10000));
         fieldList.add(new ExcelField(19, "收货地址", "receiveAddress", 10000));
 
-        fieldList.add(new ExcelField(20, "订单编号", "receiveAddress", 10000));
-        fieldList.add(new ExcelField(21, "订单来源", "receiveAddress", 10000));
+        fieldList.add(new ExcelField(20, "订单编号", "orderNo", 10000));
+        fieldList.add(new ExcelField(21, "订单来源", "orderSourceMsg", 10000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -290,15 +290,18 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
         List<ExcelField> fieldList = new ArrayList<>();
         fieldList.add(new ExcelField(0, "货单编号", "orderGoodsNo", 5000));
         fieldList.add(new ExcelField(1, "订单编号", "orderNo", 5000));
-        fieldList.add(new ExcelField(2, "发货地址", "sendAddressShorter", 5000));
-        fieldList.add(new ExcelField(3, "收货地址", "receiveAddressShorter", 5000));
-        fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
-        fieldList.add(new ExcelField(5, "提取吨数", "extractWeight", 5000));
-        fieldList.add(new ExcelField(6, "已抢单吨数", "alreadyTransportWeight", 5000));
-        fieldList.add(new ExcelField(7, "未抢单吨数", "residueTransportWeight", 5000));
-        fieldList.add(new ExcelField(8, "已装车吨数", "alreadyLoadWeight", 5000));
-        fieldList.add(new ExcelField(9, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(10, "货单状态", "orderGoodsStatus", 5000));
+        fieldList.add(new ExcelField(2, "订单来源", "orderSourceMsg", 5000));
+        fieldList.add(new ExcelField(3, "发货地址", "sendAddressShorter", 5000));
+        fieldList.add(new ExcelField(4, "收货地址", "receiveAddressShorter", 5000));
+
+        fieldList.add(new ExcelField(5, "货物名称", "goodsName", 5000));
+        fieldList.add(new ExcelField(6, "提取吨数", "extractWeight", 5000));
+        fieldList.add(new ExcelField(7, "已抢单吨数", "alreadyTransportWeight", 5000));
+        fieldList.add(new ExcelField(8, "未抢单吨数", "residueTransportWeight", 5000));
+        fieldList.add(new ExcelField(9, "已装车吨数", "alreadyLoadWeight", 5000));
+
+        fieldList.add(new ExcelField(10, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(11, "货单状态", "orderGoodsStatus", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();
@@ -306,6 +309,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
             List<ExcelData> rowData = new ArrayList<>();
             rowData.add(new ExcelData(vo.getOrderGoodsNo()));
             rowData.add(new ExcelData(vo.getOrderNo()));
+            rowData.add(new ExcelData(vo.getOrderSourceMsg(), "-"));
             rowData.add(new ExcelData(vo.getSendAddressShorter()));
             rowData.add(new ExcelData(vo.getReceiveAddressShorter()));
 
@@ -314,6 +318,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
             rowData.add(new ExcelData(vo.getAlreadyTransportWeight()));
             rowData.add(new ExcelData(vo.getResidueTransportWeight()));
             rowData.add(new ExcelData(vo.getAlreadyLoadWeight()));
+
             rowData.add(new ExcelData(vo.getCreateTime()));
             rowData.add(new ExcelData(OrderGoodsStatusEnum.Status.getMsgByCode(vo.getOrderGoodsStatus())));
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -116,7 +116,8 @@ public class OrderChildSqlProvider {
                     "driver_name,driver_mobile,load_net,unload_net," +
                     "date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
                     "date_format(finish_time, '%Y-%m-%d %H:%i:%s') as finishTime," +
-                    "date_format(pound_audit_time, '%Y-%m-%d %H:%i:%s') as poundAuditTime");
+                    "date_format(pound_audit_time, '%Y-%m-%d %H:%i:%s') as poundAuditTime," +
+                    "order_source, order_no");
             FROM("order_child ");
             if (Objects.equals(param.getTimeType(),1)) {
                 if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("pay_time >= #{param.beginTime}");}