运单详情日志修改

performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java

@@ -32,6 +32,7 @@ public enum OrderChildEnum {
 
         DRIVER_CANCEL(110, "司机取消"),
         PLATFORM_CANCEL(111, "平台取消"),
+        OWNER_CANCEL(112, "货主取消运单"),
 
 //
 //        OWNER_CONFIRM(50, "货主确认车辆"),//货主确认车辆

performance-api/src/main/java/com/clx/performance/enums/OrderChildLogEnum.java

@@ -36,9 +36,9 @@ public enum OrderChildLogEnum {
 
         COMPLETE(100, "完成"),
 
-        DRIVER_CANCEL(110, "司机取消运单"),
-        OWNER_CANCEL(111, "货主取消运单"),
-        PLATFORM_CANCEL(112, "平台取消运单"),
+        DRIVER_CANCEL(110, "司机取消"),
+        PLATFORM_CANCEL(111, "平台取消"),
+        OWNER_CANCEL(112, "货主取消运单"),
 
         ;
 

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

@@ -86,5 +86,8 @@ public class CarrierOrderChildDetailVO {
     @ApiModelProperty(value = "磅单审核列表")
     private List<OrderChildPoundAuditDetailVO> poundAudits;
 
+    @ApiModelProperty(value = "完成时间", example = "2020-01-01 10:10:10")
+    private String finishTime;
+
 
 }
\ No newline at end of file

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

@@ -14,7 +14,7 @@ public class OrderChildStatusVO {
 
 
     @ApiModelProperty("运单状态")
-    private Integer status;
+    private int status;
 
     @ApiModelProperty("运单值")
     private String value;

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

@@ -23,6 +23,7 @@ public class OrderChildLogDaoImpl extends BaseDaoImpl<OrderChildLogMapper, Order
                 , OrderChildLogEnum.Type.RELOAD.getCode(), OrderChildLogEnum.Type.REUNLOAD.getCode()
                 , OrderChildLogEnum.Type.SETTLEMENT.getCode(), OrderChildLogEnum.Type.POUND_AUDIT.getCode()
                 , OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode(), OrderChildLogEnum.Type.COMPLETE.getCode()
-                , OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getCode()).groupBy(OrderChildLog::getType).orderByDesc(OrderChildLog::getId));
+                , OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(), OrderChildLogEnum.Type.OWNER_CANCEL.getCode()
+                , OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getCode(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode()).groupBy(OrderChildLog::getType));
     }
 }

performance-web/src/main/java/com/clx/performance/model/OrderChildLog.java

@@ -10,6 +10,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 /**
 * @Author: aiqinguo
 * @Description: 运单日志
@@ -31,8 +33,8 @@ public class OrderChildLog implements HasKey<Integer> {
     private Integer createType;                     //操作人类型1-货主， 2-承运端，3-司机
     private Long createBy;                          //操作人编号
     private String createName;                      //操作人名称
-    private String createTime;                      //创建时间
-    private String modifiedTime;                    //修改时间
+    private LocalDateTime createTime;                      //创建时间
+    private LocalDateTime modifiedTime;                    //修改时间
 
     @KeyColumn("id")
     @Override