aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-07-10 17:33:59 +08:00
parent 88a25f233b
commit d170abe87d
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java
View File

@ -12,6 +12,7 @@
package com.xdadan.erp.web.emis; package com.xdadan.erp.web.emis;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.xdadan.erp.common.annotation.Log; import com.xdadan.erp.common.annotation.Log;
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.common.core.controller.BaseController; 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.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisBrand; import com.xdadan.erp.emis.domain.EmisBrand;
import com.xdadan.erp.emis.service.IEmisBrandService; import com.xdadan.erp.emis.service.IEmisBrandService;
import com.xdadan.erp.emis.utils.GZipUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@ -54,8 +57,16 @@ public class EmisBaseController extends BaseController
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
} }
}
public List getCompressExportList(List list){
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);
}
return exportList;
} }
} }

9
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -552,13 +552,8 @@ public class EmisWaybillController extends EmisBaseController
list = emisWaybillService.selectEmisWaybillList(emisWaybill); list = emisWaybillService.selectEmisWaybillList(emisWaybill);
} }
if(emisWaybill.getParams().containsKey("blExport")){ if(emisWaybill.getParams().containsKey("blZExport")){
List<String> exportList= new ArrayList<>(); List exportList=getCompressExportList(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);
}
return getDataTable(exportList); return getDataTable(exportList);
}else { }else {
return getDataTable(list); return getDataTable(list);