修改接单

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehiclePublishFindDTO.java

@@ -50,6 +50,7 @@ public class VehiclePublishFindDTO extends PageParam implements DataInter {
     @ApiModelProperty("当前时间")
     private  Long  nowTime;
 
+
     private String orderNo;
 
 
@@ -58,4 +59,7 @@ public class VehiclePublishFindDTO extends PageParam implements DataInter {
     List<Integer> dataCompanyIds;
 
     Integer bizType;
+
+    @ApiModelProperty("0-进行中；1-已取消；2-待处理,3-已处理")
+    Integer status;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehiclePublishVo.java

@@ -28,7 +28,7 @@ public class VehiclePublishVo extends VehiclePublish {
         if (status.equals(1) || status.equals(3)){
             statusStr = "已结束";
         }else if (status.equals(2)){
-            statusStr = "待收藏";
+            statusStr = "待收车";
         }else if (status.equals(0)){
             if (getConfirmNumber() != null && getConfirmNumber() > 0){
                 statusStr = "已接"+getConfirmNumber()+"辆";

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishMapper.xml

@@ -20,6 +20,9 @@
             <if test="goodsType != null ">
                 AND  p.`goods_type`= #{goodsType}
             </if>
+            <if test="status != null ">
+                AND  p.`status`= #{status}
+            </if>
             <if test="nowTime != null  and nowTime > 0">
                 AND  p.`publish_end_time` >= #{nowTime}
             </if>