Pārlūkot izejas kodu

feat:实时调度列表查询bug

wangweiyu 4 gadi atpakaļ
vecāks
revīzija
5af9dbe6d6

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

@@ -96,4 +96,11 @@ public class TruckOrderManageVO implements Serializable {
     @ApiModelProperty(value = "空车重车状态:0-空车 1-重车")
     private Integer weightFlag;
 
+    @ApiModelProperty(value = "托运方id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long shipperId;
+
+    @ApiModelProperty(value = "托运方名称")
+    private String shipperName;
+
 }

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

@@ -61,7 +61,7 @@
           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, wc.id as cycleId,
+          two.shipper_id as shipperId, two.shipper_name as shipperName,  two.update_date as updateDate, two.create_date as createDate, two.queue_no as queueNo, wc.id as cycleId,
           case when wc.jing_weight > 0 then 1 else 0 end as weightFlag
         FROM
         truck