From e551e10a7334857ddab661d743600a644a8c70f8 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 10 Jul 2025 15:48:25 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/web/emis/EmisCommissionDtlController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java index 59d498a84..3476a8e52 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java @@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.json.JSONObject; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.utils.GZipUtils; @@ -121,7 +122,8 @@ public class EmisCommissionDtlController extends BaseController List list = emisCommissionDtlService.selectCommissionDtlMapList(emisCommissionDtl); if(emisCommissionDtl.getParams().containsKey("blExport")){ List exportList= new ArrayList<>(); - String encStr = GZipUtils.zipToBase64Str(JSON.toJSONString(list)); + JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + String encStr = GZipUtils.zipToBase64Str(JSON.toJSONString(list, SerializerFeature.WriteMapNullValue ,SerializerFeature.WriteDateUseDateFormat)); if(encStr!=null) { exportList.add(encStr); }