easyexcel去除根据数据库字段翻译

承运订单/托运订单-查询/统计逻辑修改

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/annotation/Translate.java

@@ -1,41 +0,0 @@
-package com.sckw.excel.annotation;
-
-
-import java.lang.annotation.*;
-
-
-/**
- * 对某个字段进行翻译
- * 可以标注在类和方法上
- * 1. 标注在类上：适用于对整个实体的指定字段进行翻译
- * 2. 标注在方法上：适用于对方法的返回值中的data数据实体进行翻译
- * 标注在类和方法上时，如果同时存在@Translates和@Translate,则@Translates会生效,@Translate不会生效
- *
- * @author lfdc
- * @version v1
- * @create 2020-11-28 15:37:35
- * @copyright
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Repeatable(Translates.class)
-@Documented
-public @interface Translate {
-    /**
-     * 需要翻译的字段
-     */
-    String field();
-    /**
-     * 指定数据源
-     */
-
-    /**
-     * 字段值为字符串
-     */
-    boolean isString() default true;
-
-    /**
-     * 字段值为数组
-     */
-    boolean isArray() default false;
-}

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/annotation/Translates.java

@@ -1,21 +0,0 @@
-package com.sckw.excel.annotation;
-
-import java.lang.annotation.*;
-
-/**
- *
- * 组合注解
- * 用于指定翻译多个字段
- *
- * @author lfdc
- * @version v1
- * @create 2020-11-28 15:37:35
- * @copyright
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Documented
-public @interface Translates {
-
-    Translate[] value();
-}

sckw-modules/sckw-report/src/main/java/com/sckw/report/controller/KwTransportController.java

@@ -7,6 +7,7 @@ import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.report.service.KwAcceptCarriageService;
 import com.sckw.report.service.KwConsignService;
 import com.sckw.report.service.KwTransportService;
+import com.sckw.report.service.param.AcceptCarriageOrderQuery;
 import com.sckw.report.service.param.ConsignOrderQuery;
 import com.sckw.report.service.param.WaybillOrderQuery;
 import com.sckw.report.service.vo.AcceptCarriageOrderExcelVo;
@@ -49,7 +50,7 @@ public class KwTransportController {
      * @return
      */
     @RequestMapping(value = "/selectAcceptCarriageOrderList", method = RequestMethod.POST)
-    public HttpResult acceptCarriageOrderList(@Validated @RequestBody ConsignOrderQuery query) {
+    public HttpResult acceptCarriageOrderList(@Validated @RequestBody AcceptCarriageOrderQuery query) {
         HttpResult httpResult = new HttpResult();
         try {
             httpResult = acceptCarriageService.acceptCarriageOrderList(query,"2");
@@ -67,7 +68,7 @@ public class KwTransportController {
      * @return
      */
     @RequestMapping(value = "/statisticsAcceptCarriage", method = RequestMethod.POST)
-    public HttpResult statisticsAcceptCarriage(@Validated @RequestBody ConsignOrderQuery query) {
+    public HttpResult statisticsAcceptCarriage(@Validated @RequestBody AcceptCarriageOrderQuery query) {
         try {
             return acceptCarriageService.statisticsAcceptCarriage(query,"2");
         } catch (Exception e) {
@@ -83,7 +84,7 @@ public class KwTransportController {
      * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.POST)
-    public HttpResult exportAcceptCarriage(@Validated @RequestBody ConsignOrderQuery query) {
+    public HttpResult exportAcceptCarriage(@Validated @RequestBody AcceptCarriageOrderQuery query) {
         HttpServletResponse response = RequestHolder.getResponse();
         List<AcceptCarriageOrderExcelVo> list = acceptCarriageService.exportAcceptCarriage(query,"2");
         if (!org.springframework.util.CollectionUtils.isEmpty(list)) {
@@ -145,20 +146,6 @@ public class KwTransportController {
         return HttpResult.ok("没有可导出的数据");
     }
 
-//    /**
-//     * 托运订单-(订单详情)
-//     * @param id
-//     * @return
-//     */
-//    @RequestMapping(value = "/getOrderDetailConsign", method = RequestMethod.GET)
-//    public HttpResult getOrderDetailConsign(@RequestParam("id") Long id) {
-//        try {
-//            return transportService.getOrderDetail(id);
-//        } catch (Exception e) {
-//            log.error("托运订单-(订单详情)查询失败:{}", e.getMessage(), e);
-//            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
-//        }
-//    }
 
     /**
      * 运单管理-运单列表

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwAcceptCarriageService.java

@@ -12,7 +12,7 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.DateUtil;
 import com.sckw.mongo.model.SckwLogisticsOrder;
 import com.sckw.mongo.model.TableTops;
-import com.sckw.report.service.param.ConsignOrderQuery;
+import com.sckw.report.service.param.AcceptCarriageOrderQuery;
 import com.sckw.report.service.vo.AcceptCarriageOrderExcelVo;
 import com.sckw.report.service.vo.AcceptCarriageOrderVo;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +27,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -48,11 +50,12 @@ public class KwAcceptCarriageService {
 
     /**
      * 承运列表分页查询
+     *
      * @param query
      * @param unitType
      * @return
      */
-    public HttpResult acceptCarriageOrderList(ConsignOrderQuery query, String unitType)  {
+    public HttpResult acceptCarriageOrderList(AcceptCarriageOrderQuery query, String unitType) {
         //模糊匹配
         //根据条件查询所有并排序，且分页
         //设置模糊查询匹配规则  忽略大小写
@@ -60,11 +63,32 @@ public class KwAcceptCarriageService {
         Criteria criteria = new Criteria();
         // 1. 全等于
         //判断承运还是托运企业
-        if (unitType.equals(NumberConstant.ONE)){
+        if (unitType.equals(NumberConstant.ONE)) {
             criteria.and("checkEntId").is(LoginUserHolder.getEntId());
-        }else {
+        } else {
             criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
         }
+        //装卸货地址
+        String loadCode = query.getLoadAddressCode();
+        if (StringUtils.isNotBlank(loadCode)) {
+            switch (query.getLoadAddressLevel()) {
+                case 1 -> criteria.and("loadCityCode")
+                        .regex(Pattern.compile("^" + loadCode.substring(0, 2) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 2 -> criteria.and("loadCityCode")
+                        .regex(Pattern.compile("^" + loadCode.substring(0, 4) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 3 -> criteria.and("loadCityCode").is(loadCode);
+            }
+        }
+        String unloadCode = query.getUnloadAddressCode();
+        if (StringUtils.isNotBlank(unloadCode)) {
+            switch (query.getUnloadAddressLevel()) {
+                case 1 -> criteria.and("unloadCityCode")
+                        .regex(Pattern.compile("^" + unloadCode.substring(0, 2) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 2 -> criteria.and("unloadCityCode")
+                        .regex(Pattern.compile("^" + unloadCode.substring(0, 4) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 3 -> criteria.and("unloadCityCode").is(unloadCode);
+            }
+        }
         if (StringUtils.isNotBlank(query.getLoadAddress())) {
             criteria.and("loadDetailAddress").is(query.getLoadAddress());
         }
@@ -79,6 +103,10 @@ public class KwAcceptCarriageService {
         if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
             criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")
                     .lte(query.getEndDateTime()));
+        } else if (StringUtils.isNotEmpty(query.getStartDateTime())) {
+            criteria.and("createTime").gte(query.getStartDateTime());
+        } else if (StringUtils.isNotEmpty(query.getEndDateTime())) {
+            criteria.and("createTime").lte(query.getStartDateTime());
         }
         //多条件模糊查询
         Criteria c1 = new Criteria();
@@ -117,7 +145,8 @@ public class KwAcceptCarriageService {
         PageResult build = PageResult.build(query.getPage(), query.getPageSize(), total, returnList);
         return HttpResult.ok(build);
     }
-    public HttpResult statisticsAcceptCarriage(ConsignOrderQuery param, String unitType) {
+
+    public HttpResult statisticsAcceptCarriage(AcceptCarriageOrderQuery param, String unitType) {
         //模糊匹配
         //根据条件查询所有并排序，且分页
         //设置模糊查询匹配规则  忽略大小写
@@ -125,11 +154,32 @@ public class KwAcceptCarriageService {
         Criteria criteria = new Criteria();
         // 1. 全等于
         //判断承运还是托运企业
-        if (unitType.equals(NumberConstant.ONE)){
+        if (unitType.equals(NumberConstant.ONE)) {
             criteria.and("checkEntId").is(LoginUserHolder.getEntId());
-        }else {
+        } else {
             criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
         }
+        //装卸货地址
+        String loadCode = param.getLoadAddressCode();
+        if (StringUtils.isNotBlank(loadCode)) {
+            switch (param.getLoadAddressLevel()) {
+                case 1 -> criteria.and("loadCityCode")
+                        .regex(Pattern.compile("^" + loadCode.substring(0, 2) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 2 -> criteria.and("loadCityCode")
+                        .regex(Pattern.compile("^" + loadCode.substring(0, 4) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 3 -> criteria.and("loadCityCode").is(loadCode);
+            }
+        }
+        String unloadCode = param.getUnloadAddressCode();
+        if (StringUtils.isNotBlank(unloadCode)) {
+            switch (param.getUnloadAddressLevel()) {
+                case 1 -> criteria.and("unloadCityCode")
+                        .regex(Pattern.compile("^" + unloadCode.substring(0, 2) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 2 -> criteria.and("unloadCityCode")
+                        .regex(Pattern.compile("^" + unloadCode.substring(0, 4) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 3 -> criteria.and("unloadCityCode").is(unloadCode);
+            }
+        }
         if (StringUtils.isNotBlank(param.getLoadAddress())) {
             criteria.and("loadDetailAddress").is(param.getLoadAddress());
         }
@@ -144,6 +194,10 @@ public class KwAcceptCarriageService {
         if (StringUtils.isNotEmpty(param.getStartDateTime()) && StringUtils.isNotEmpty(param.getEndDateTime())) {
             criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
                     .lte(param.getEndDateTime()));
+        } else if (StringUtils.isNotEmpty(param.getStartDateTime())) {
+            criteria.and("createTime").gte(param.getStartDateTime());
+        } else if (StringUtils.isNotEmpty(param.getEndDateTime())) {
+            criteria.and("createTime").lte(param.getStartDateTime());
         }
         List<String> stringList = StringUtils.splitStrToList(param.getIds(), StringConstant.COMMA, String.class);
         if (CollectionUtils.isNotEmpty(stringList)) {
@@ -176,10 +230,15 @@ public class KwAcceptCarriageService {
         /**补全数据状态不齐的情况*/
         packageReturnStatistics(mappedResults, arrayList);
         // 查询结果
-        return HttpResult.ok(arrayList);
+        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN);
+        map.put("tableTop", arrayList);
+        // 查询结果
+        return HttpResult.ok(map);
     }
+
     /**
      * 组装承运订单列表数据
+     *
      * @param list
      * @param returnList
      */
@@ -231,7 +290,6 @@ public class KwAcceptCarriageService {
     }
 
 
-
     /**
      * 组装返回数据
      *
@@ -263,7 +321,7 @@ public class KwAcceptCarriageService {
                 arrayList.add(top);
             }
         }
-        if (CollectionUtils.isNotEmpty(arrayList)){
+        if (CollectionUtils.isNotEmpty(arrayList)) {
             /**补全统计【全部字段】*/
             Integer sum = Math.toIntExact(arrayList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getTotal())).collect(Collectors.summarizingInt(item -> item.getTotal())).getSum());
             TableTops top = new TableTops();
@@ -276,22 +334,23 @@ public class KwAcceptCarriageService {
 
     /**
      * 承运分页详情导出
+     *
      * @param query
      * @param unitType
      * @return
      */
-    public List<AcceptCarriageOrderExcelVo> exportAcceptCarriage(ConsignOrderQuery query, String unitType) {
+    public List<AcceptCarriageOrderExcelVo> exportAcceptCarriage(AcceptCarriageOrderQuery query, String unitType) {
         //模糊匹配
         //根据条件查询所有并排序，且分页
         //设置模糊查询匹配规则  忽略大小写
         // 创建条件对象
         Criteria criteria = new Criteria();
         // 1. 全等于
-        Query query1 =new Query();
+        Query query1 = new Query();
         //判断承运还是托运企业
-        if (unitType.equals(NumberConstant.ONE)){
+        if (unitType.equals(NumberConstant.ONE)) {
             criteria.and("checkEntId").is(LoginUserHolder.getEntId());
-        }else {
+        } else {
             criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
         }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
@@ -330,7 +389,7 @@ public class KwAcceptCarriageService {
             if (CollectionUtils.isNotEmpty(stringList)) {
                 query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
             }
-        }else {
+        } else {
             query1.addCriteria(criteria);
             if (CollectionUtils.isNotEmpty(stringList)) {
                 query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
@@ -344,6 +403,7 @@ public class KwAcceptCarriageService {
         }
         return returnList;
     }
+
     private void packageReturnList(List<SckwLogisticsOrder> list, List<AcceptCarriageOrderExcelVo> returnList) {
         for (SckwLogisticsOrder logisticsOrder : list) {
             AcceptCarriageOrderExcelVo vo = new AcceptCarriageOrderExcelVo();

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwConsignService.java

@@ -69,6 +69,27 @@ public class KwConsignService {
         } else {
             criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
         }
+        //装卸货地址
+        String loadCode = query.getLoadAddressCode();
+        if (StringUtils.isNotBlank(loadCode)) {
+            switch (query.getLoadAddressLevel()) {
+                case 1 -> criteria.and("loadCityCode")
+                        .regex(Pattern.compile("^" + loadCode.substring(0, 2) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 2 -> criteria.and("loadCityCode")
+                        .regex(Pattern.compile("^" + loadCode.substring(0, 4) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 3 -> criteria.and("loadCityCode").is(loadCode);
+            }
+        }
+        String unloadCode = query.getUnloadAddressCode();
+        if (StringUtils.isNotBlank(unloadCode)) {
+            switch (query.getUnloadAddressLevel()) {
+                case 1 -> criteria.and("unloadCityCode")
+                        .regex(Pattern.compile("^" + unloadCode.substring(0, 2) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 2 -> criteria.and("unloadCityCode")
+                        .regex(Pattern.compile("^" + unloadCode.substring(0, 4) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 3 -> criteria.and("unloadCityCode").is(unloadCode);
+            }
+        }
         if (StringUtils.isNotBlank(query.getLoadAddress())) {
             criteria.and("loadDetailAddress").is(query.getLoadAddress());
         }
@@ -83,6 +104,10 @@ public class KwConsignService {
         if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
             criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")
                     .lte(query.getEndDateTime()));
+        } else if (StringUtils.isNotEmpty(query.getStartDateTime())) {
+            criteria.and("createTime").gte(query.getStartDateTime());
+        } else if (StringUtils.isNotEmpty(query.getEndDateTime())) {
+            criteria.and("createTime").lte(query.getStartDateTime());
         }
         //多条件模糊查询
         Criteria c1 = new Criteria();
@@ -306,6 +331,27 @@ public class KwConsignService {
         } else {
             criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
         }
+        //装卸货地址
+        String loadCode = param.getLoadAddressCode();
+        if (StringUtils.isNotBlank(loadCode)) {
+            switch (param.getLoadAddressLevel()) {
+                case 1 -> criteria.and("loadCityCode")
+                        .regex(Pattern.compile("^" + loadCode.substring(0, 2) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 2 -> criteria.and("loadCityCode")
+                        .regex(Pattern.compile("^" + loadCode.substring(0, 4) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 3 -> criteria.and("loadCityCode").is(loadCode);
+            }
+        }
+        String unloadCode = param.getUnloadAddressCode();
+        if (StringUtils.isNotBlank(unloadCode)) {
+            switch (param.getUnloadAddressLevel()) {
+                case 1 -> criteria.and("unloadCityCode")
+                        .regex(Pattern.compile("^" + unloadCode.substring(0, 2) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 2 -> criteria.and("unloadCityCode")
+                        .regex(Pattern.compile("^" + unloadCode.substring(0, 4) + ".*$", Pattern.CASE_INSENSITIVE));
+                case 3 -> criteria.and("unloadCityCode").is(unloadCode);
+            }
+        }
         if (StringUtils.isNotBlank(param.getLoadAddress())) {
             criteria.and("loadDetailAddress").is(param.getLoadAddress());
         }
@@ -320,6 +366,10 @@ public class KwConsignService {
         if (StringUtils.isNotEmpty(param.getStartDateTime()) && StringUtils.isNotEmpty(param.getEndDateTime())) {
             criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
                     .lte(param.getEndDateTime()));
+        } else if (StringUtils.isNotEmpty(param.getStartDateTime())) {
+            criteria.and("createTime").gte(param.getStartDateTime());
+        } else if (StringUtils.isNotEmpty(param.getEndDateTime())) {
+            criteria.and("createTime").lte(param.getStartDateTime());
         }
         List<String> stringList = StringUtils.splitStrToList(param.getIds(), StringConstant.COMMA, String.class);
         if (CollectionUtils.isNotEmpty(stringList)) {

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/AcceptCarriageOrderQuery.java

@@ -4,7 +4,6 @@ import com.sckw.core.model.page.PageRequest;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author lfdc
@@ -13,39 +12,53 @@ import java.util.List;
  */
 @Data
 public class AcceptCarriageOrderQuery extends PageRequest implements Serializable {
-    private List<String> ids;
+
     /**
-     * 订单id
+     * 数据id-主要用于订单导出
      */
-    private String orderId;
+    private String ids;
     /**
-     * 单位名称
+     * 计费方式
      */
-    private String companyName;
+    private String billingMode;
     /**
-     * 货物名称
+     * 结束时间
      */
-    private String goodsName;
-
+    private String endDateTime;
     /**
-     *装载地点
+     * 关键字搜索
      */
-    private String stowageAddress;
-
+    private String keywords;
     /**
-     * 卸载地点
+     * 装货地址code
      */
-    private String unloadAddress;
+    private String loadAddressCode;
+    /**
+     * 装货地址
+     */
+    private String loadAddress;
+    /**
+     * 装货地址等级
+     */
+    private Integer loadAddressLevel;
     /**
      * 开始时间
      */
-    private String startDate;
+    private String startDateTime;
     /**
-     * 结束时间
+     * 单据状态
      */
-    private String endDate;
+    private String status;
     /**
-     * 计费方式
+     * 卸货地址code
      */
-    private String billingMode;
+    private String unloadAddressCode;
+    /**
+     * 卸货地址
+     */
+    private String unloadAddress;
+    /**
+     * 卸货地址等级
+     */
+    private Integer unloadAddressLevel;
 }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/ConsignOrderQuery.java

@@ -30,10 +30,18 @@ public class ConsignOrderQuery extends PageRequest implements Serializable {
      * 关键字搜索
      */
     private String keywords;
+    /**
+     * 装货地址code
+     */
+    private String loadAddressCode;
     /**
      * 装货地址
      */
     private String loadAddress;
+    /**
+     * 装货地址等级
+     */
+    private Integer loadAddressLevel;
     /**
      * 开始时间
      */
@@ -42,8 +50,17 @@ public class ConsignOrderQuery extends PageRequest implements Serializable {
      * 单据状态
      */
     private String status;
+    /**
+     * 卸货地址code
+     */
+    private String unloadAddressCode;
     /**
      * 卸货地址
      */
     private String unloadAddress;
+
+    /**
+     * 卸货地址等级
+     */
+    private Integer unloadAddressLevel;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.transport.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -14,13 +15,13 @@ public class OrderTakingDTO {
     /**
      * 单据号
      */
-    @NotNull(message = "单据号不能为空")
+    @NotBlank(message = "单据号不能为空")
     @JsonProperty(value = "lOrderNo")
     private String lOrderNo;
     /**
      * 数据主键id
      */
-    @NotNull(message = "主键id不能为空")
+    @NotBlank(message = "主键id不能为空")
     @JsonProperty(value = "lOrderId")
     private String lOrderId;
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/KwtLogisticsOrderVO.java

@@ -0,0 +1,212 @@
+package com.sckw.transport.model.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.sckw.excel.annotation.ExcelContext;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author lfdc
+ * @description 物流订单
+ * @date 2023-06-26 16:06:12
+ */
+@Data
+@ExcelContext(fileName = "主表信息",sheetName = "主表信息")
+public class KwtLogisticsOrderVO implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 物流订单类型（1 贸易订单生成物流订单、2 自建物流订单）
+     */
+    private String type;
+
+    /**
+     * 交易订单id（kwo_trade_order）
+     */
+    private Long tOrderId;
+
+    /**
+     * 交易订单编号（kwo_trade_order）
+     */
+    private String tOrderNo;
+
+    /**
+     * 物流订单编号
+     */
+    private String lOrderNo;
+
+    /**
+     * 分包上级物流订单id
+     */
+    private Long pid;
+
+    /**
+     * 分包所有物流订单id
+     */
+    private String pids;
+
+    /**
+     * 结算周期(周结、月结、季结)
+     */
+    private Long settlementCycle;
+    /**
+     * 计费方式
+     */
+    private String billingMode;
+
+    /**
+     * 运价
+     */
+    private BigDecimal price;
+
+    /**
+     * 运价方式(元/吨、元/车）
+     */
+    @Min(value = 0,message = "运价方式类型不能大于等于{value}")
+    @Max(value = 4,message = "运价方式类型不能大于等于{value}")
+    private Long priceType;
+
+    /**
+     * 已委托量
+     */
+    @Digits(integer = 10,fraction = 2,message = "委托量格式不正确")
+    @DecimalMin(value = "0.00",message = "委托量不能小于{value}")
+    private BigDecimal amount;
+
+    /**
+     * 单位（吨、方、箱、件）
+     */
+    private String unit;
+
+    /**
+     * 合理损耗
+     */
+    private BigDecimal loss;
+
+    /**
+     * 合理损耗单位(‰/kG)
+     */
+    private String lossUnit;
+
+    /**
+     * 商品价值（扣亏货值）
+     */
+    private BigDecimal goodsPrice;
+
+    /**
+     * 商品价值（扣亏货值）单位
+     */
+    private String goodsPriceUnit;
+
+    /**
+     * 计划开始日期
+     */
+    private Date startTime;
+
+    /**
+     * 计划结束日期
+     */
+    private Date endTime;
+
+    /**
+     * 分包量
+     */
+    private BigDecimal subcontractAmount;
+
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 卸货量
+     */
+    private BigDecimal unloadAmount;
+
+    /**
+     * 装货量
+     */
+    private BigDecimal loadAmount;
+
+    /**
+     * 忽略剩余量
+     */
+    private BigDecimal ignoreAmount;
+
+    /**
+     * 亏吨量(装货量-卸货量)
+     */
+    private BigDecimal deficitAmount;
+
+    /**
+     * 亏吨扣款
+     */
+    private BigDecimal deficitPrice;
+
+    /**
+     * 实际开始时间（装货）
+     */
+    private Date loadTime;
+
+    /**
+     * 实际结束时间（卸货）
+     */
+    private Date unloadTime;
+
+    /**
+     * 付款方式(预付款、线下支付、第三方支付）
+     */
+    private Long payment;
+
+    /**
+     * 发票税率（%）
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 用户状态（0正常、1已锁）
+     */
+    @ExcelProperty(value = "单据状态")
+    private Integer status;
+
+    private Long createBy;
+
+    private Date createTime;
+
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    @TableLogic(value = "0")
+    private Integer delFlag;
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -670,7 +670,8 @@ public class AcceptCarriageOrderService {
 
     /**
      * 分包列表下方数据统计
-     * @param lOrderId  物流订单id
+     *
+     * @param lOrderId 物流订单id
      * @return
      */
     public HttpResult getSubcontractConsignmentCount(String lOrderId) {