Merge branch 'v5.5_driver_report_20231015' into v6.4_transportation_20231110

performance-api/src/main/java/com/clx/performance/enums/collect/CollectTruckWaitEnum.java

@@ -12,8 +12,8 @@ public enum CollectTruckWaitEnum {
     @Getter
     @AllArgsConstructor
     public enum ReportType {
-        LOAD(1, "装车类型"),
-        UNLOAD(2, "卸车类型");
+        LOAD(1, "货源地排队"),
+        UNLOAD(2, "目的地排队");
         private final Integer code;
         private final String msg;
 

performance-api/src/main/java/com/clx/performance/vo/pc/IntegralTruckVO.java

@@ -3,10 +3,10 @@ package com.clx.performance.vo.pc;
 import com.clx.performance.util.NumberToChineseUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
 * @Author: aiqinguo
@@ -58,4 +58,28 @@ public class IntegralTruckVO {
     @ApiModelProperty(value = "信息上报积分", example = "1")
     private Integer reportIntegral=0;
 
+    @ApiModelProperty(value = "信息上报积分", example = "1")
+    private List<IntegralItem> integralItemList;
+    public List<IntegralItem> getIntegralItemList() {
+        return Arrays.asList(
+                new IntegralItem("运单完成积分", orderChildCompleteIntegral),
+                new IntegralItem("平台补偿积分", platformCompensationIntegral),
+                new IntegralItem("运单取消积分", orderChildCancelIntegral),
+                new IntegralItem("运单超时积分", orderChildTimeoutIntegral),
+                new IntegralItem("信息上报积分", reportIntegral)
+        );
+    }
+
+    @Getter
+    @Setter
+    @ToString
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class IntegralItem{
+        @ApiModelProperty(value = "名称", example = "1")
+        private String name;
+        @ApiModelProperty(value = "信息上报积分", example = "1")
+        private Integer integral;
+    }
+
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckWaitVO.java

@@ -84,7 +84,7 @@ public class CollectTruckWaitVO {
     @ApiModelProperty(value = "预计等待时长图片", example = "")
     private List<String> stationImageList;
     public List<String> getStationImageList() {
-        return StringUtils.isEmpty(stationOutImage)? new ArrayList<>() : JSON.parseArray(stationInImage, String.class);
+        return StringUtils.isEmpty(stationInImage)? new ArrayList<>() : JSON.parseArray(stationInImage, String.class);
     }
 
     @ApiModelProperty(value = "上报时间", example = "")