Merge branch 'v12.4_permanent_taskbar_20240320'

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

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
 
 
 @ApiModel(description = "运单表")
@@ -38,4 +39,12 @@ public class GoingOrderChildVO {
     private String lastArriveSendTime;
 
 
+    @ApiModelProperty(value = "最晚到达目的地时间", example = "2012-01-01 00:00:00")
+    private String lastArriveReceiveTime;
+
+
+    @ApiModelProperty(value = "最晚装货时间", example = "2012-01-01 00:00:00")
+    private String lastLoadTime;
+
+
 }
\ No newline at end of file

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

+package com.clx.performance.controller.app;
+
+import com.clx.performance.service.DictionaryService;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotBlank;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/dictionary")
+@Validated
+@Api(tags = "承运司机端-字典")
+@AllArgsConstructor
+public class AppDictionaryController {
+
+    private final DictionaryService dictionaryService;
+
+
+    @ApiOperation(value = "字典",notes = "<br>By:李瑞新")
+    @GetMapping("/getOneByKey")
+    public Result<String> getOneByKey(@NotBlank(message = "key不能为空") String key) {
+        return Result.ok(dictionaryService.getOneByKey(key));
+    }
+
+}

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

@@ -1894,6 +1894,8 @@ public class OrderChildServiceImpl implements OrderChildService {
             OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
                     PerformanceResultEnum.ORDER_INVALID);
             orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+            orderChildVO.setLastArriveReceiveTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
+            orderChildVO.setLastLoadTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
         }
 
         return orderChildVO;