司机上报

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

@@ -16,8 +16,8 @@ public class CarrierPageCollectNoTakeOrderReportParam extends PageParam {
     private String name;
     @ApiModelProperty(value = "联系方式", example = "")
     private String mobile;
-    @ApiModelProperty(value = "运单编号", example = "")
-    private String childNo;
+    @ApiModelProperty(value = "货单编号", example = "")
+    private String orderGoodsNo;
     @ApiModelProperty(value = "发货地", example = "")
     private String sendAddress;
     @ApiModelProperty(value = "收货地", example = "")

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectLineReportSqlProvider.java

@@ -100,7 +100,7 @@ public class CollectLineReportSqlProvider {
             FROM("collect_line_report ");
             WHERE("report_type = 6");
 
-            if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
+            if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {WHERE("order_goods_no = #{param.orderGoodsNo}");}
             if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address like CONCAT(#{param.sendAddress},'%')");}
             if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address like CONCAT(#{param.receiveAddress},'%')");}
             if (StringUtils.isNotBlank(param.getName())) {WHERE("name = #{param.name}");}