feat:新增运力实时调度未执行非全员已读车辆查询；运单新增全员已读标识字段

src/main/java/com/aoyang/tms/controller/param/WorkManagePageParam.java

@@ -71,6 +71,9 @@ public class WorkManagePageParam {
     @ApiModelProperty(value = "未执行运单")
     private Integer unExecuted;
 
+    @ApiModelProperty(value = "未执行运单 非全员已读")
+    private Integer unExecutedUnread;
+
     @ApiModelProperty(value = "")
     private Integer orderType;
 

src/main/java/com/aoyang/tms/controller/vo/TruckOrderStatisticsVO.java

@@ -51,13 +51,16 @@ public class TruckOrderStatisticsVO implements Serializable {
     @ApiModelProperty(value = "未派单")
     private Integer unAllocated;
 
-    @ApiModelProperty(value = "未执行运单")
-    private Integer unExecuted;
-
     @ApiModelProperty(value = "空车未派装车单")
     private Integer emptyUnAllocated;
 
     @ApiModelProperty(value = "重车未派卸车单")
     private Integer heavyUnAllocated;
 
+    @ApiModelProperty(value = "未执行运单")
+    private Integer unExecuted;
+
+    @ApiModelProperty(value = "未执行运单 非全员已读")
+    private Integer unExecutedUnread;
+
 }

src/main/java/com/aoyang/tms/entity/WorkOrder.java

@@ -240,6 +240,9 @@ public class WorkOrder implements Serializable {
     @TableField("stop_note")
     private String stopNote;
 
+    @ApiModelProperty(value = "全员已读标识")
+    @TableField("read_flag")
+    private Integer readFlag;
 
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")

src/main/java/com/aoyang/tms/mapper/TruckMapper.java

@@ -31,6 +31,8 @@ public interface TruckMapper extends BaseMapper<Truck> {
 
     int getUnExecutedOrderTruckCount(@Param("param") WorkManagePageParam param);
 
+    int getUnExecutedOrderUnreadCount(@Param("param") WorkManagePageParam param);
+
     int getUnAllocatedTruckCount(@Param("param") WorkManagePageParam param);
 
     int getUnAllocatedOrderCount(@Param("param") WorkManagePageParam param);

src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -151,6 +151,8 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         vo.setSurplusCount(vo.getTotal() - vo.getLoadCount() - vo.getUnloadCount());
         //未执行运单
         vo.setUnExecuted(truckMapper.getUnExecutedOrderTruckCount(param));
+        //未执行运单 非全员已读
+        vo.setUnExecuted(truckMapper.getUnExecutedOrderUnreadCount(param));
         //未派单
         vo.setUnAllocated(truckMapper.getUnAllocatedTruckCount(param));
         //空车未派装车单

src/main/resources/mapper/TruckMapper.xml

@@ -118,6 +118,9 @@
             <if test="param!=null and param.unExecuted == 1">
                 and two.order_status = 0
             </if>
+            <if test="param!=null and param.unExecutedUnread == 1">
+                and two.order_status = 0 and two.read_flag = 0
+            </if>
             <if test="param!=null and param.unAllocated == 1">
                 and two.id is null
             </if>
@@ -231,6 +234,23 @@
         group by truck.truck_id ) tbl
     </select>
 
+    <!-- 查询未执行派单非全员已读车辆 -->
+    <select id="getUnExecutedOrderUnreadCount" parameterType="com.aoyang.tms.controller.param.WorkManagePageParam" resultType="java.lang.Integer">
+        SELECT count(1)
+        FROM ( select truck.truck_id from truck left join tms_work_order wo on truck.truck_id = wo.truck_id and wo.order_status = 0
+        WHERE truck.org_id = #{param.orgId} and wo.id is not null and wo.read_flag = 0
+        <if test="param!=null and param.deptId!=null">
+            and truck.dept_id = #{param.deptId}
+        </if>
+        <if test="param!=null and param.carNumber!=null and param.carNumber!='' ">
+            and truck.car_number = #{param.carNumber}
+        </if>
+        <if test="param!=null and param.shipperId!=null">
+            and wo.shipper_id = #{param.shipperId}
+        </if>
+        group by truck.truck_id ) tbl
+    </select>
+
     <!-- 查询未派单车辆 -->
     <select id="getUnAllocatedTruckCount" parameterType="com.aoyang.tms.controller.param.WorkManagePageParam" resultType="java.lang.Integer">
         SELECT count(1)