运单详情

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -7,12 +7,17 @@ import com.aoyang.tms.controller.vo.TruckInfo;
 import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.service.WorkOrderService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 
+import javax.annotation.Resource;
+
 /**
  * @Description: 作业人员相关接口
  * @Author guoyong
@@ -21,6 +26,9 @@ import org.springframework.web.bind.annotation.RequestHeader;
  */
 public class WorkerController {
 
+    @Resource
+    private WorkOrderService workOrderService;
+
     @ApiOperation(value = "获取作业人员信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态")
     @PostMapping("/find_worker_info")
     public Result<WorkerInfo> find_worker_info(@RequestHeader(value = "orgId") Long orgId,
@@ -38,16 +46,31 @@ public class WorkerController {
     @ApiOperation(value = "获取待执行作业列表信息", notes = "卡车id、必传")
     @PostMapping("/find_todo_work_list")
     public Result<Page<WorkOrderVO>> find_todo_work_list(@RequestHeader(value = "orgId") Long orgId,
-                                                          @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+                                                         @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
         return new Result<>(null);
     }
 
     @ApiOperation(value = "获取运力详情信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
     public Result<WorkerInfo> find_truck_info(@RequestHeader(value = "orgId") Long orgId,
-                                                  @RequestHeader(value = "userId") Long userId) {
+                                              @RequestHeader(value = "userId") Long userId) {
         return new Result<>(new WorkerInfo());
     }
 
+    @ApiOperation(value = "个人全部运单列表", notes = "获取司机或押运员的运单列表")
+    @PostMapping("/find_work_order_page")
+    public Result<IPage<WorkOrder>> find_work_order_list(@RequestHeader(value = "orgId") Long orgId,
+                                                         @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+        Page<WorkOrder> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkOrder> records = workOrderService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "运单详情信息", notes = "获取司机或押运员的运单列表")
+    @PostMapping("/find_work_order_info")
+    public Result<WorkOrderVO> find_work_order_info(@RequestHeader(value = "orgId") Long orgId,
+                                                    @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+        return new Result<>(new WorkOrderVO());
+    }
 
 }

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

@@ -1,5 +1,6 @@
 package com.aoyang.tms.controller.vo;
 
+import com.aoyang.tms.entity.WorkOrder;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -25,200 +26,19 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("work_order")
 @ApiModel(value="WorkOrder对象", description="运单运单表")
-public class WorkOrderVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id,自增")
-    @TableId(value = "id", type = IdType.AUTO)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
-
-    @ApiModelProperty(value = "运单号")
-    @TableField("order_no")
-    private String orderNo;
-
-    @ApiModelProperty(value = "组织id")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "组织名称")
-    @TableField("org_name")
-    private String orgName;
-
-    @ApiModelProperty(value = "组织简称")
-    @TableField("org_short_name")
-    private String orgShortName;
-
-    @ApiModelProperty(value = "司机1id")
-    @TableField("driver_id_one")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverIdOne;
-
-    @ApiModelProperty(value = "司机1姓名")
-    @TableField("driver_name_one")
-    private String driverNameOne;
-
-    @ApiModelProperty(value = "司机2id")
-    @TableField("driver_id_two")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverIdTwo;
-
-    @ApiModelProperty(value = "司机2姓名")
-    @TableField("driver_name_two")
-    private String driverNameTwo;
-
-    @ApiModelProperty(value = "押运员id")
-    @TableField("escort_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long escortId;
-
-    @ApiModelProperty(value = "押运员姓名")
-    @TableField("escort_name")
-    private String escortName;
-
-    @ApiModelProperty(value = "分配卡车id")
-    @TableField("truck_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "车牌号")
-    @TableField("car_number")
-    private String carNumber;
-
-    @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_car_number")
-    private String trailerCarNumber;
-
-    @ApiModelProperty(value = "托运方id")
-    @TableField("shipper_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long shipperId;
-
-    @ApiModelProperty(value = "托运方名称")
-    @TableField("shipper_name")
-    private String shipperName;
-
-    @ApiModelProperty(value = "1装车、2卸车")
-    @TableField("type")
-    private Integer type;
-
-    @ApiModelProperty(value = "运单状态：0-待执行 1-前往 2-等待 3-成果报备 4-已完成 5-已关闭")
-    @TableField("order_status")
-    private Integer orderStatus;
-
-    @ApiModelProperty(value = "作业地点id")
-    @TableField("spot_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long spotId;
-
-    @ApiModelProperty(value = "作业地点名")
-    @TableField("spot_name")
-    private String spotName;
-
-    @ApiModelProperty(value = "计划到达时间")
-    @TableField("plan_reach_time")
-    private LocalDateTime planReachTime;
-
-    @ApiModelProperty(value = "计划离开时间")
-    @TableField("plan_leave_time")
-    private LocalDateTime planLeaveTime;
-
-    @ApiModelProperty(value = "实际到达时间")
-    @TableField("actual_reach_time")
-    private LocalDateTime actualReachTime;
-
-    @ApiModelProperty(value = "实际离开时间")
-    @TableField("actual_leave_time")
-    private LocalDateTime actualLeaveTime;
-
-    @ApiModelProperty(value = "计划重量")
-    @TableField("plan_weight")
-    private Integer planWeight;
-
-    @ApiModelProperty(value = "装车实际净重")
-    @TableField("actual_weight")
-    private String actualWeight;
-
-    @ApiModelProperty(value = "作业人员备注")
-    @TableField("worker_note")
-    private String workerNote;
-
-    @ApiModelProperty(value = "调度人员备注")
-    @TableField("note")
-    private String note;
-
-    @ApiModelProperty(value = "车辆里程数")
-    @TableField("trip")
-    private String trip;
-
-    @ApiModelProperty(value = "车辆里程数照片url")
-    @TableField("trip_url")
-    private String tripUrl;
-
-    @ApiModelProperty(value = "排队号")
-    @TableField("queue_no")
-    private String queueNo;
-
-    @ApiModelProperty(value = "装卸车开始时间")
-    @TableField("work_start_time")
-    private LocalDateTime workStartTime;
-
-    @ApiModelProperty(value = "装卸车结束时间")
-    @TableField("work_end_time")
-    private LocalDateTime workEndTime;
-
-    @ApiModelProperty(value = "成果报备磅单号")
-    @TableField("weighting_list_no")
-    private String weightingListNo;
-
-    @ApiModelProperty(value = "成果报备磅单url")
-    @TableField("weighting_list_url")
-    private String weightingListUrl;
-
-    @ApiModelProperty(value = "成果报备皮重")
-    @TableField("pi_weight")
-    private String piWeight;
-
-    @ApiModelProperty(value = "成果报备毛重")
-    @TableField("mao_weight")
-    private String maoWeight;
-
-    @ApiModelProperty(value = "成果报备净重")
-    @TableField("jing_weight")
-    private String jingWeight;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建人姓名")
-    @TableField("creater_name")
-    private String createrName;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "修改人id")
-    @TableField("updater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long updater;
-
-    @ApiModelProperty(value = "修改人姓名")
-    @TableField("updater_name")
-    private String updaterName;
-
-    @ApiModelProperty(value = "修改日期时间")
-    @TableField("update_date")
-    private LocalDateTime updateDate;
+public class WorkOrderVO extends WorkOrder implements Serializable {
 
     @ApiModelProperty(value = "已读未读状态,0未读，1已读")
     private Integer readFlag;
 
+    @ApiModelProperty(value = "装卸车点经度")
+    @TableField("longitude")
+    private String longitude;
+
+    @ApiModelProperty(value = "装卸车点纬度")
+    @TableField("latitude")
+    private String latitude;
+
 
 }