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 33f083987..97d98c149 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 @@ -12,6 +12,7 @@ package com.xdadan.erp.web.emis; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; import com.xdadan.erp.common.annotation.Log; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.core.controller.BaseController; @@ -22,12 +23,14 @@ import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.utils.poi.ExcelUtil; import com.xdadan.erp.emis.domain.EmisBrand; import com.xdadan.erp.emis.service.IEmisBrandService; +import com.xdadan.erp.emis.utils.GZipUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; /** @@ -54,8 +57,16 @@ public class EmisBaseController extends BaseController }catch (Exception ex){ ex.printStackTrace(); } + } - + public List getCompressExportList(List list){ + List 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); + } + return exportList; } } diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 02e743ea5..c00423d92 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -552,13 +552,8 @@ public class EmisWaybillController extends EmisBaseController list = emisWaybillService.selectEmisWaybillList(emisWaybill); } - if(emisWaybill.getParams().containsKey("blExport")){ - List 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(emisWaybill.getParams().containsKey("blZExport")){ + List exportList=getCompressExportList(list); return getDataTable(exportList); }else { return getDataTable(list);