Переглянути джерело

feat:运力实时调度新增空车重车标识字段

wangweiyu 4 роки тому
батько
коміт
2a5a2ca4c6

+ 3 - 0
src/main/java/com/aoyang/tms/controller/vo/TruckOrderManageVO.java

@@ -93,4 +93,7 @@ public class TruckOrderManageVO implements Serializable {
     @ApiModelProperty(value = "已读未读信息")
     private List<ReadInfo> readInfos;
 
+    @ApiModelProperty(value = "空车重车状态:0-空车 1-重车")
+    private Integer weightFlag;
+
 }

+ 3 - 1
src/main/resources/mapper/TruckMapper.xml

@@ -61,7 +61,8 @@
           truck.truck_id as truckId, truck.tms_status as tmsStatus, truck.org_id as orgId, truck.org_name as orgName, truck.org_short_name as orgShortName,
           truck.car_number as carNumber, truck.trailer_number as trailerNumber, truck.dept_id as deptId, truck.dept_name as deptName,
           two.id as orderId, two.order_status as orderStatus, two.order_no as orderNo, two.type, two.spot_id as spotId, two.spot_name as spotName,
-          two.update_date as updateDate, two.create_date as createDate, two.queue_no as queueNo
+          two.update_date as updateDate, two.create_date as createDate, two.queue_no as queueNo,
+          case when wc.jing_weight > 0 then 1 else 0 end as weightFlag
         FROM
         truck
         left join (
@@ -95,6 +96,7 @@
         </if>
         order by order_status desc, plan_reach_time asc
         ) two on truck.truck_id = two.truck_id
+        left join tms_work_cycle wc on truck.truck_id = wc.truck_id and wc.status = 1
         <where>
             <if test="param!=null and param.orgId!=null">
                 and truck.org_id = #{param.orgId}