1.装卸货信息前后端字段映射

2.新增mapper

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WaybillOrderTicketApprovalV1Dto.java

@@ -2,11 +2,13 @@ package com.sckw.transport.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 import java.util.List;
 
@@ -43,6 +45,8 @@ public class WaybillOrderTicketApprovalV1Dto {
     /**
      * 装卸量信息
      */
+    @JsonProperty("loadLoading")
+    @SerializedName("loadLoading")
     @NotNull(message = "装货数量信息不能为空")
     List<WaybillOrderTicketLoadingDto> load;
 
@@ -65,6 +69,8 @@ public class WaybillOrderTicketApprovalV1Dto {
     /**
      * 装卸量信息
      */
+    @JsonProperty("unloadLoading")
+    @SerializedName("unloadLoading")
     @NotNull(message = "卸货数量信息不能为空")
     List<WaybillOrderTicketLoadingDto> unload;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/Import/KwtAcceptCarriageOrderImportService.java

@@ -153,7 +153,7 @@ public class KwtAcceptCarriageOrderImportService {
     public HttpResult externalImportExcel(MultipartFile file) {
 
         /**文件存储至oss*/
-//        saveImportExcel(file);
+        saveImportExcel(file);
 
         /**文件必填写校验*/
         HttpResult result = this.checkImportExcel(file);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderTicketService.java

@@ -8,8 +8,8 @@ import com.sckw.core.utils.FileUtils;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
-import com.sckw.transport.dao.*;
-import com.sckw.transport.model.KwtLogisticsOrderGoodsUnit;
+import com.sckw.transport.dao.KwtWaybillOrderMapper;
+import com.sckw.transport.dao.KwtWaybillOrderTicketMapper;
 import com.sckw.transport.model.KwtWaybillOrder;
 import com.sckw.transport.model.KwtWaybillOrderTicket;
 import com.sckw.transport.model.dto.WaybillOrderTicketLoadingDto;
@@ -21,7 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author zk
@@ -154,7 +157,7 @@ public class KwtWaybillOrderTicketService {
         }
         if (CollectionUtils.isNotEmpty(unload)) {
             List<WaybillOrderLoadingVO> unloadLoading = new ArrayList<>();
-            load.forEach(e -> {
+            unload.forEach(e -> {
                 SysDictResDto sysDict = unitType != null ? unitType.get(e.getUnit()) : null;
                 waybillTicket.setUnloadUrl(FileUtils.splice(e.getUrls()));
                 waybillTicket.setUnloadTime(e.getOperateTime() == null ? null : DateUtil.getDateTime(e.getOperateTime()));

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderImportMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderImportMapper">
+    <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderImport">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <id column="ent_id" jdbcType="BIGINT" property="entId"/>
+        <result column="url" jdbcType="VARCHAR" property="url"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+    </resultMap>
+</mapper>