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

performance-api/src/main/java/com/clx/performance/param/pc/PageCarrierOrderChildParam.java

@@ -41,4 +41,9 @@ public class PageCarrierOrderChildParam extends PageParam {
     @ApiModelProperty(value = "结束时间",example = "2020-01-01 10:10:10")
     private String endTime;
 
+    @ApiModelProperty(value = "车牌号",example = "晋A12345")
+    private String truckNo;
+
+
+
 }

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

@@ -67,13 +67,8 @@ public class PageCarrierOrderChildVO {
     @ApiModelProperty(value="收货地址",example = "山西")
     private String receiveAddress;
 
-
-
-
-
-
-
-
+    @ApiModelProperty(value = "车牌号",example = "晋A12345")
+    private String truckNo;
 
 
 

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

@@ -110,7 +110,7 @@ public class OrderChildSqlProvider {
 
     public String pageCarrierOrderChildList(@Param("page") Page<PageCarrierOrderChildVO> page, @Param("param") PageCarrierOrderChildParam param) {
         return new SQL(){{
-            SELECT("child_no,order_goods_no,status,goods_name," +
+            SELECT("truck_no,child_no,order_goods_no,status,goods_name," +
                     "freight_price,send_address,receive_address,load_rough,load_tare,unload_rough,unload_tare," +
                     "driver_name,driver_mobile,load_net,unload_net," +
                     "date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
@@ -126,6 +126,7 @@ public class OrderChildSqlProvider {
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address = #{param.sendAddress}");}
             if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address= #{param.receiveAddress}");}
             if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
+            if (StringUtils.isNotBlank(param.getTruckNo())) {WHERE("truck_no= #{param.truckNo}");}
 
             ORDER_BY("id desc");
         }}.toString();