订单明细报表导出：数字类型格式修改

@@ -16,6 +16,10 @@ import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -53,10 +57,45 @@ public class OrderDetailReportExportTaskWorker implements
                 data.getLengthTolPos() != null ? data.getLengthTolPos().doubleValue() : null,
                 data.getLengthTolNeg() != null ? data.getLengthTolNeg().doubleValue() : null);
 
-        OrderDetailStatisticsModel model = JsonUtil.parseObject(JsonUtil.toJsonString(data), OrderDetailStatisticsModel.class);
+        OrderDetailStatisticsModel model = new OrderDetailStatisticsModel();
+        model.setOrderNo(data.getOrderNo());
+        model.setOrderDate1(toDate(data.getOrderDate()));
+        model.setOrderDate(toDate(data.getOrderDate()));
+        model.setWorkshopName(data.getWorkshopName());
+        model.setDeptName(data.getDeptName());
+        model.setRegionName(data.getRegionName());
+        model.setOrderingUnitName(data.getOrderingUnitName());
+        model.setIndustry(data.getIndustry());
+        model.setBrand(data.getBrand());
+        model.setThickness(data.getThickness());
+        model.setWidth(data.getWidth());
+        model.setLength(data.getLength());
+        model.setStatus(data.getStatus());
+        model.setQuantity(data.getQuantity());
+        model.setDeliveryDate(toDate(data.getDeliveryDate()));
         model.setThicknessTol(thicknessTol);
         model.setWidthTol(widthTol);
         model.setLengthTol(lengthTol);
+        model.setSuggestedPrice(stringToBigDecimal(data.getSuggestedPrice()));
+        model.setAssessmentExceedsAgreement(stringToBigDecimal(data.getAssessmentExceedsAgreement()));
+        model.setSalesPrice(stringToBigDecimal(data.getSalesPrice()));
+        model.setPriceListNo(data.getPriceListNo());
+        model.setPackagingFee(stringToBigDecimal(data.getPackagingFee()));
+        model.setInvoicingStatus(data.getInvoicingStatus());
+        model.setPieceWeightHeader(data.getPieceWeightHeader());
+        model.setSurface(data.getSurface());
+        model.setTolerance(data.getTolerance());
+        model.setPerformance(data.getPerformance());
+        model.setPackaging(data.getPackaging());
+        model.setSpecialRequirements(data.getSpecialRequirements());
+        model.setRemarks(data.getRemarks());
+        model.setShippingCost(stringToBigDecimal(data.getShippingCost()));
+        model.setReturnShippingCost(stringToBigDecimal(data.getReturnShippingCost()));
+        model.setCustomerType(data.getCustomerType());
+        model.setQuality(data.getQuality());
+        model.setContractType(data.getContractType());
+        model.setStockUpCompanyName(data.getStockUpCompanyName());
+        model.setOrderType(data.getOrderType());
         return model;
     }
 
@@ -64,4 +103,27 @@ public class OrderDetailReportExportTaskWorker implements
     public Class<OrderDetailStatisticsModel> getModelClass() {
         return OrderDetailStatisticsModel.class;
     }
+
+    private static Date toDate(LocalDate date) {
+        if (date == null) {
+            return null;
+        }
+        return Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+
+    public static BigDecimal stringToBigDecimal(String str) {
+        // 1. 判空处理：如果为 null 或去除空格后为空字符串，直接返回 null
+        if (str == null || str.trim().isEmpty()) {
+            return null;
+        }
+
+        // 2. 尝试转换
+        try {
+            // 建议先 trim() 去除首尾空格，避免 " 100 " 这种格式报错
+            return new BigDecimal(str.trim());
+        } catch (NumberFormatException e) {
+            // 3. 如果字符串格式不合法（如 "abc"），根据业务需求处理，这里同样返回 null
+            return null;
+        }
+    }
 }

 package com.lframework.xingyun.sc.excel.statistics;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.format.NumberFormat;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
 import lombok.Data;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -18,25 +21,26 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 订货金额
      */
     @ExcelProperty("订货金额")
-    private String amount;
+    private BigDecimal amount;
 
     /**
      * 超协金额
      */
     @ExcelProperty("超协金额")
-    private String superCoordinationAmount;
+    private BigDecimal superCoordinationAmount;
 
     /**
      * 折65金额
      */
     @ExcelProperty("折65金额")
-    private String discountAmount;
+    private BigDecimal discountAmount;
 
     /**
      * 订货日期
      */
     @ExcelProperty("订货日期")
-    private String orderDate1;
+    @DateTimeFormat("yyyy-MM-dd")
+    private Date orderDate1;
 
     /**
      * 订单编号
@@ -48,7 +52,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 包装金额
      */
     @ExcelProperty("包装金额")
-    private String packagingAmount;
+    private BigDecimal packagingAmount;
 
     /**
      * 当日电铜
@@ -60,7 +64,8 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 订货日期
      */
     @ExcelProperty("订货日期")
-    private String orderDate;
+    @DateTimeFormat("yyyy-MM-dd")
+    private Date orderDate;
 
     /**
      * 生产厂
@@ -156,19 +161,20 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 指导价
      */
     @ExcelProperty("指导价")
-    private String suggestedPrice;
+    private BigDecimal suggestedPrice;
 
     /**
      * 发货日期
      */
     @ExcelProperty("发货日期")
-    private String deliveryDate;
+    @DateTimeFormat("yyyy-MM-dd")
+    private Date deliveryDate;
 
     /**
      * 超协价
      */
     @ExcelProperty("超协价")
-    private String assessmentExceedsAgreement;
+    private BigDecimal assessmentExceedsAgreement;
 
     /**
      * 当日南海H65
@@ -180,7 +186,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 销售价
      */
     @ExcelProperty("销售价")
-    private String salesPrice;
+    private BigDecimal salesPrice;
 
     /**
      * 价格表编号
@@ -192,7 +198,7 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 包装费
      */
     @ExcelProperty("包装费")
-    private String packagingFee;
+    private BigDecimal packagingFee;
 
     /**
      * 开票要求
@@ -252,13 +258,13 @@ public class OrderDetailStatisticsModel implements ExcelModel {
      * 运费
      */
     @ExcelProperty("运费")
-    private String shippingCost;
+    private BigDecimal shippingCost;
 
     /**
      * 回程运费
      */
     @ExcelProperty("回程运费")
-    private String returnShippingCost;
+    private BigDecimal returnShippingCost;
 
     /**
      * 客户类型