添加状态跟踪查询条件

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbills.java

@@ -1,13 +1,13 @@
 package com.ruoyi.orderPlan.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 订单主对象 F_TMSORDERBILLS
@@ -237,6 +237,11 @@ public class Ftmsorderbills extends BaseEntity {
     private String carStatus;
 
     /**
+     * 是否显示全部数据
+     */
+    private String modeStatus;
+
+    /**
      * 车号
      */
     private String carregNo;
@@ -262,10 +267,30 @@ public class Ftmsorderbills extends BaseEntity {
     private List<String> cLoadDate;
 
     /**
+     * 查询司机接单时间区间
+     */
+    private List<String> acceptDateList;
+
+    /**
      * 查询派车数量的时间区间
      */
     private List<String> currentDay;
 
+    /** 是否是区分车队 */
+    private String isFleet;
+
+    /** 运单号 */
+    private String orderNo;
+
+    /** 主运单号 */
+    private String mBillNo;
+
+    /** 业务类型 */
+    private String billKind;
+
+    /** 车队id */
+    private Long fleetId;
+
     public String getIsFleet() {
         return isFleet;
     }
@@ -274,11 +299,6 @@ public class Ftmsorderbills extends BaseEntity {
         this.isFleet = isFleet;
     }
 
-    /** 是否是区分车队 */
-    private String isFleet;
-
-    /** 车队id */
-    private Long fleetId;
 
     public String getPlanBillStatus() {
         return planBillStatus;
@@ -296,6 +316,22 @@ public class Ftmsorderbills extends BaseEntity {
         this.fleetId = fleetId;
     }
 
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getmBillNo() {
+        return mBillNo;
+    }
+
+    public void setmBillNo(String mBillNo) {
+        this.mBillNo = mBillNo;
+    }
+
     public Long getId() {
         return id;
     }
@@ -760,6 +796,30 @@ public class Ftmsorderbills extends BaseEntity {
         this.currentDay = currentDay;
     }
 
+    public List<String> getAcceptDateList() {
+        return acceptDateList;
+    }
+
+    public void setAcceptDateList(List<String> acceptDateList) {
+        this.acceptDateList = acceptDateList;
+    }
+
+    public String getBillKind() {
+        return billKind;
+    }
+
+    public void setBillKind(String billKind) {
+        this.billKind = billKind;
+    }
+
+    public String getModeStatus() {
+        return modeStatus;
+    }
+
+    public void setModeStatus(String modeStatus) {
+        this.modeStatus = modeStatus;
+    }
+
     @Override
     public String toString() {
         return "Ftmsorderbills{" +
@@ -813,15 +873,22 @@ public class Ftmsorderbills extends BaseEntity {
                 ", billStatus=" + billStatus +
                 ", delFlag='" + delFlag + '\'' +
                 ", remarks='" + remarks + '\'' +
+                ", planBillStatus='" + planBillStatus + '\'' +
                 ", orderStatus=" + orderStatus +
                 ", carStatus='" + carStatus + '\'' +
+                ", modeStatus='" + modeStatus + '\'' +
                 ", carregNo='" + carregNo + '\'' +
                 ", driverTel='" + driverTel + '\'' +
                 ", invoiceType='" + invoiceType + '\'' +
                 ", planDate=" + planDate +
                 ", cLoadDate=" + cLoadDate +
+                ", acceptDateList=" + acceptDateList +
                 ", currentDay=" + currentDay +
-                ", isFleet=" + isFleet +
+                ", isFleet='" + isFleet + '\'' +
+                ", orderNo='" + orderNo + '\'' +
+                ", mBillNo='" + mBillNo + '\'' +
+                ", billKind='" + billKind + '\'' +
+                ", fleetId=" + fleetId +
                 '}';
     }
 }

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillsMapper.xml

@@ -189,7 +189,7 @@
             AND f.goods_id = #{goodsId}
         </if>
         <if test="invoiceType != null and invoiceType == 'scheduling'">
-            AND f.bill_status >= 6
+            AND f.bill_status &gt;= 6
         </if>
         <if test="mblno != null and mblno != ''">
             AND f.mblno LIKE "%${mblno}%"
@@ -203,9 +203,6 @@
         <if test="unLoadAddr != null and unLoadAddr != ''">
             AND f.un_load_addr LIKE "%${unLoadAddr}%"
         </if>
-        <if test="billStatus != null and billStatus != ''">
-            AND f.bill_status LIKE "%${billStatus}%"
-        </if>
         ${params.dataScope}
         ORDER BY f.bill_status, f.id asc
     </select>

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -561,6 +561,7 @@
             <if test="goodsId != null">and t.goods_id = #{goodsId}</if>
             <if test="driverTel != null">and c.driver_tel = #{driverTel}</if>
             <if test="orderStatus != null">and c.order_status = #{orderStatus}</if>
+            <if test="billKind != null">and c.bill_kind = #{billKind}</if>
             <if test="carStatus != null and carStatus == 'planDate'">and c.order_status = 10</if>
             <if test="carStatus != null and carStatus == 'acceptDate'">and c.order_status = 20</if>
             <if test="carStatus != null and carStatus == 'loadDate'">and c.order_status = 40</if>
@@ -576,6 +577,12 @@
             <if test='planDate != null and planDate[1] != null and planDate[1]!= ""'>
                 and c.plan_date &lt;= #{planDate[1]}
             </if>
+            <if test='acceptDateList != null and acceptDateList[0] != null and acceptDateList[0]!= ""'>
+                and c.accept_date &gt;= #{acceptDateList[0]}
+            </if>
+            <if test='acceptDateList != null and acceptDateList[1] != null and acceptDateList[1]!= ""'>
+                and c.accept_date &lt;= #{acceptDateList[1]}
+            </if>
             <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
                 and c.load_date &gt;= #{cLoadDate[0]}
             </if>
@@ -583,6 +590,8 @@
                 and c.load_date &lt;= #{cLoadDate[1]}
             </if>
             <if test="mblno != null  and mblno != ''">and t.mblno like concat('%', #{mblno}, '%')</if>
+            <if test="orderNo != null  and orderNo != ''">and c.order_no like concat('%', #{orderNo}, '%')</if>
+            <if test="mBillNo != null  and mBillNo != ''">and c.m_bill_no like concat('%', #{mBillNo}, '%')</if>
             <if test="carregNo != null  and carregNo != ''">and c.carreg_no like concat('%', #{carregNo}, '%')</if>
             <if test="loadAddr != null  and loadAddr != ''">and t.load_addr like concat('%', #{loadAddr}, '%')</if>
             <if test="unLoadAddr != null  and unLoadAddr != ''">and t.un_load_addr like concat('%', #{unLoadAddr},'%')</if>