From 2305e259318d37df5b88e5c8d41f39c415bb6221 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 10 Jul 2025 17:39:39 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisBaseController.java   |  5 +++++
 .../erp/web/emis/EmisCommissionDtlController.java     | 11 +++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java
index 97d98c149..690bfef4f 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java
@@ -59,6 +59,11 @@ public class EmisBaseController extends BaseController
             }
     }
 
+    /**
+     * 导出数据压缩
+     * @param list
+     * @return
+     */
     public List getCompressExportList(List list){
         List<String> exportList=  new ArrayList<>();
         JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
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 3476a8e52..51fa3f4af 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
@@ -57,7 +57,7 @@ import com.xdadan.erp.emis.service.IEmisCommissionDtlService;
  */
 @RestController
 @RequestMapping("/emis/emisCommissionDtl")
-public class EmisCommissionDtlController extends BaseController
+public class EmisCommissionDtlController extends EmisBaseController
 {
     @Autowired
     private IEmisCommissionDtlService emisCommissionDtlService;
@@ -120,13 +120,8 @@ public class EmisCommissionDtlController extends BaseController
         }
 
         List<Map> list = emisCommissionDtlService.selectCommissionDtlMapList(emisCommissionDtl);
-        if(emisCommissionDtl.getParams().containsKey("blExport")){
-            List<String> exportList=  new ArrayList<>();
-            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);
-            }
+        if(emisCommissionDtl.getParams().containsKey("blZExport")){
+            List exportList=getCompressExportList(list);
             return getDataTable(exportList);
         }else {
             return getDataTable(list);