Merge remote-tracking branch 'origin/master'

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

@@ -84,6 +84,18 @@ public class WorkerController {
         return new Result<>(list);
     }
 
+    @ApiOperation(value = "当前行车周期内运单列表", notes = "卡车id必传，当前行车周期内运单列表")
+    @PostMapping("/find_cycle_order_list")
+    public Result<List<WorkOrderVO>> findCycleOrderList(@RequestHeader(value = "orgId") Long orgId,
+                                                       @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
+        log.info("当前行车周期内运单列表,/tms/worker/find_cycle_order_list，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        List<WorkOrderVO> list = workOrderService.findWorkOrderList(userId, workOrder);
+        return new Result<>(list);
+    }
+
     @ApiOperation(value = "点击待执行运单，变成已读", notes = "必传参数:truckId,orderId")
     @PostMapping("/add_work_order_readinfo")
     public Result work_cycle_page(@RequestHeader(value = "orgId") Long orgId,

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

@@ -31,7 +31,7 @@ public class Shipper implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "id,自增")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "shipper_id", type = IdType.AUTO)
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long shipperId;