Merge remote-tracking branch 'origin/v30.2_break_contract_20241021' into dev_jdk17

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

+package com.clx.performance.dao;
+
+import com.clx.performance.mapper.OrderChildExceptionReportOperationLogMapper;
+import com.clx.performance.model.OrderChildExceptionReportOperationLog;
+import com.msl.common.dao.BaseDao;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 运单日志
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+public interface OrderChildExceptionReportOperationLogDao extends BaseDao<OrderChildExceptionReportOperationLogMapper, OrderChildExceptionReportOperationLog, Integer> {
+}

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

+package com.clx.performance.dao.impl;
+
+import com.clx.performance.dao.OrderChildExceptionReportOperationLogDao;
+import com.clx.performance.mapper.OrderChildExceptionReportOperationLogMapper;
+import com.clx.performance.model.OrderChildExceptionReportOperationLog;
+import com.msl.common.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: aiqinguo
+ * @Description: 运单图片
+ * @Date: 2023/09/18 11:34:50
+ * @Version: 1.0
+ */
+@Repository
+public class OrderChildExceptionReportOperationLogDaoImpl extends BaseDaoImpl<OrderChildExceptionReportOperationLogMapper, OrderChildExceptionReportOperationLog, Integer> implements OrderChildExceptionReportOperationLogDao {
+}

clx-performance-web/src/main/java/com/clx/performance/mapper/OrderChildExceptionReportOperationLogMapper.java

+package com.clx.performance.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.clx.performance.model.OrderChildExceptionReportOperationLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @Author: aiqinguo
+* @Description: 运单日志
+* @Date: 2023/09/18 11:34:50
+* @Version: 1.0
+*/
+
+@Mapper
+public interface OrderChildExceptionReportOperationLogMapper extends BaseMapper<OrderChildExceptionReportOperationLog> {
+
+}
\ No newline at end of file

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

@@ -72,6 +72,15 @@ public class OrderChildExceptionReport implements HasKey<Integer> {
     @Schema(description="异常原因描述")
     private String reason;
 
+
+    @TableField("picture_url")
+    @Schema(description="图片")
+    private String pictureUrl;
+
+    @TableField("video_url")
+    @Schema(description="视频")
+    private String videoUrl;
+
     @TableField("deal_user_code")
     @Schema(description="处理人用户编码")
     private Long dealUserCode;
@@ -92,6 +101,10 @@ public class OrderChildExceptionReport implements HasKey<Integer> {
     @Schema(description="是否转司机违约  1:是")
     private Integer transferDriverBreakContract;
 
+    @TableField("break_contract_reason")
+    @Schema(description="违约原因")
+    private String breakContractReason;
+
     @TableField("create_time")
     @Schema(description="创建时间")
     private LocalDateTime createTime;

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

@@ -47,6 +47,16 @@ public class OrderChildExceptionReportDealLog implements HasKey<Integer> {
     @Schema(description="视频")
     private String videoUrl;
 
+    @TableField("create_by")
+    @Schema(description="申诉人编码")
+    private Long createBy;                          //操作人编号
+
+    @TableField("create_name")
+    @Schema(description="申诉人")
+    private String createName;                      //操作人名称
+
+
+
     @TableField("create_time")
     @Schema(description="创建时间")
     private LocalDateTime createTime;

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

+package com.clx.performance.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.msl.common.config.KeyColumn;
+import com.msl.common.model.HasKey;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+@TableName(autoResultMap = true)
+public class OrderChildExceptionReportOperationLog implements HasKey<Integer> {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;                             //id
+    private String reportNo;                         //异常上报编号
+    private Integer type;                           //操作事项编码
+    private String result;                          //处理结果
+    private Long createBy;                          //操作人编号
+    private String createName;                      //操作人名称
+    private LocalDateTime createTime;                      //创建时间
+    private LocalDateTime modifiedTime;                    //修改时间
+
+    @KeyColumn("id")
+    @Override
+    public Integer gainKey() {
+        return id;
+    }
+}
\ No newline at end of file

clx-performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractDriverRecord.java

 package com.clx.performance.model.breakcontract;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.msl.common.config.KeyColumn;
 import com.msl.common.model.HasKey;
@@ -8,9 +10,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
+
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 
 /**
@@ -28,7 +29,7 @@ public class BreakContractDriverRecord  implements HasKey<Integer> {
     private Integer id;
 
     @TableField("trigger_type")
-    @Schema(description="触发类型：1系统触发 2手动触发")
+    @Schema(description="触发类型：1系统触发 2手动触发 3.异常上报")
     private Integer triggerType;
 
     @TableField("break_contract_party_type")
@@ -79,6 +80,33 @@ public class BreakContractDriverRecord  implements HasKey<Integer> {
     @Schema(description="结算单编号")
     private String settlementNo;
 
+
+
+    @TableField("exception_report_no")
+    @Schema(description="异常上报单号")
+    private String exceptionReportNo;
+
+
+    @TableField("exception_category")
+    @Schema(description="异常类别")
+    private String exceptionCategory;
+
+    @TableField("exception_type")
+    @Schema(description="异常类型")
+    private String exceptionType;
+
+    @TableField("picture_url")
+    @Schema(description="图片")
+    private String pictureUrl;
+
+    @TableField("video_url")
+    @Schema(description="视频")
+    private String videoUrl;
+
+
+
+
+
     @TableField("remark")
     @Schema(description="备注")
     private String remark;

clx-performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractDriverRecordService.java

@@ -23,6 +23,8 @@ public interface BreakContractDriverRecordService  {
 
     IPage<DriverBreakContractDriverRecordVO> driverPageRecord(DriverPageBreakContractDriverRecordParam param);
 
+    String breakNoGenerate();
+
     void saveDriverRecordOfOrderChildCancel(OrderChild orderChild, Long createBy, String createName);
 
     void saveDriverRecordOfArriveSendAddressTimeout(OrderChild orderChild, Long createBy, String createName);

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

@@ -128,7 +128,8 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
 
     }
 
-    private String breakNoGenerate() {
+    @Override
+    public String breakNoGenerate() {
         return "WYD"+uniqueOrderNumService.getUniqueOrderNum(
                 LocalDateTimeUtils.convertLocalDateTimeToString(LocalDateTime.now(), LocalDateTimeUtils.DATE_DAY));
     }

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

+package com.clx.performance.struct;
+
+import com.clx.performance.model.OrderChildExceptionReportOperationLog;
+import com.clx.performance.vo.pc.OrderChildExceptionReportOperationLogVO;
+
+import java.util.List;
+
+public interface OrderChildExceptionReportOperationLogStruct {
+    List<OrderChildExceptionReportOperationLogVO> convertList(List<OrderChildExceptionReportOperationLog> list);
+}

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

@@ -14,6 +14,7 @@ public enum BreakContractRecordEnum {
     public enum TriggerType {
         SYSTEM(1, "系统触发"),
         MANUAL(2, "手动触发"),
+        EXCEPTION_REPORT(3, "异常上报"),
         ;
 
         private final Integer code;

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum CarrierExceptionLogEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+
+
+
+        CREATE(1, "创建违约单"),
+        TIMEOUT(2, "超时货主处理"),
+        APPEAL(3, "申诉"),
+        APPEAL_DEAL(4, "申诉处理"),
+        AGREE(5, "同意扣罚"),
+        TRANSFER_DRIVER_BREAK_CONTRACT(6, "转司机违约"),
+        ;
+
+        private final Integer code;
+        private final String name;
+
+        public static Optional<Type> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+        public static String getMsgByCode(Integer code) {
+            if (code == null) {return null;}
+            return getByCode(code).map(Type::getName).orElse(null);
+        }
+    }
+
+
+}

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class OrderChildExceptionReportOperationLogVO {
+
+
+    @Schema(description = "id")
+    private Integer id;                             //id
+    @Schema(description = "异常上报编号")
+    private String reportNo;                         //运单编号
+    @Schema(description = "操作事项编码")
+    private Integer type;                           //操作事项编码
+    @Schema(description = "处理结果")
+    private String result;                          //处理结果
+    @Schema(description = "操作人名称")
+    private String createName;                      //操作人名称
+    @Schema(description = "创建时间")
+    private String createTime;                      //创建时间
+
+}
\ No newline at end of file

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

@@ -127,14 +127,41 @@ public class OrderChildExceptionReportVO {
     private String  createTime;
 
 
-    @Schema(description="图片")
+    @Schema(description="异常记录图片")
     private List<String> pictureUrlList;
 
-    @Schema(description="视频")
+    @Schema(description="异常记录视频")
     private List<String> videoUrlList;
 
 
 
 
 
+
+    @Schema(description="申诉时间")
+    private String appealTime;
+
+    @Schema(description="申诉人")
+    private String createName;
+
+    @Schema(description="申诉原因")
+    private String appealReason;
+
+
+    @Schema(description="申诉图片")
+    private List<String> appealPictureUrlList;
+
+    @Schema(description="申诉视频")
+    private List<String> appealVideoUrlList;
+
+
+
+
+    @Schema(description="操作日志列表")
+    private List<OrderChildExceptionReportOperationLogVO> operationLogs;
+
+
+
+
+
 }