最近进行中的运单

performance-api/src/main/java/com/clx/performance/param/pc/PoundAuditParam.java

@@ -21,7 +21,7 @@ import java.math.BigDecimal;
 public class PoundAuditParam  {
 
     @NotBlank(message = "运单编号不能为空")
-    @ApiModelProperty(value="运单编号",example = "201457878")
+    @ApiModelProperty(value="运单编号",example = "CYD201457878")
     private String childNo;
 
     @ApiModelProperty(value="审核驳回类型：1装车 2卸车 3装车+卸车",example = "1")

performance-api/src/main/java/com/clx/performance/vo/app/GoingOrderChildVO.java

+package com.clx.performance.vo.app;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+
+@ApiModel(description = "运单表")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class GoingOrderChildVO {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    private String childNo;
+
+    @ApiModelProperty(value = "发货地址", example = "朝阳")
+    private String sendAddress;
+
+    @ApiModelProperty(value = "收货地址", example = "西城")
+    private String receiveAddress;
+    @ApiModelProperty(value = "最晚装货时间", example = "")
+    private String loadDeadline;
+
+    @ApiModelProperty(value = "车牌号", example = "京A12345")
+    private String truckNo;
+
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverOrderChildController.java

@@ -165,4 +165,12 @@ public class AppDriverOrderChildController {
         return Result.ok(orderChildService.getOrderChildFreightInfo(childNo));
     }
 
+
+    @ApiOperation(value = "查询正在进行中的最新运单", notes = "<br>By:李瑞新")
+    @GetMapping("/getGoingLatestOrderChild")
+    public Result<GoingOrderChildVO> getGoingLatestOrderChild() {
+
+        return Result.ok(orderChildService.getGoingLatestOrderChild());
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -47,4 +47,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param);
 
     Optional<List<OrderChild>> getOrderChildInfoByOrderGoodsNo(String childNo);
+
+    OrderChild getGoingLatestOrderChild(Long driverUserNo);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -166,4 +166,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return Optional.of(list(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)));
     }
 
+    @Override
+    public OrderChild getGoingLatestOrderChild(Long driverUserNo) {
+        return getOne(lQrWrapper().eq(OrderChild::getDriverUserNo,driverUserNo)
+                .le(OrderChild::getStatus,OrderChildEnum.Status.UNLOAD)
+                .orderByDesc(OrderChild::getId)
+                .last("limit 1"));
+    }
 }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -58,4 +58,6 @@ public interface OrderChildService {
 
     CarrierOrderChildDetailVO getCarrierOrderChildDetail(String childNo);
 
+    GoingOrderChildVO getGoingLatestOrderChild();
+
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1056,4 +1056,11 @@ public class OrderChildServiceImpl implements OrderChildService {
         carrierOrderChildDetailVO.setUnloadImageList(unloadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
         return carrierOrderChildDetailVO;
     }
+
+    @Override
+    public GoingOrderChildVO getGoingLatestOrderChild() {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        OrderChild orderChild = orderChildDao.getGoingLatestOrderChild(loginUserInfo.getUserNo());
+        return orderChildStruct.convertGoingOrder(orderChild);
+    }
 }

performance-web/src/main/java/com/clx/performance/struct/OrderChildStruct.java

 package com.clx.performance.struct;
 
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.vo.app.GoingOrderChildVO;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
 import com.clx.performance.vo.pc.OrderChildPCVO;
@@ -19,4 +20,8 @@ public interface OrderChildStruct {
 
     CarrierOrderChildDetailVO carrierConvert(OrderChild item);
 
+    GoingOrderChildVO convertGoingOrder(OrderChild item);
+
+
+
 }