md
This commit is contained in:
parent
e35023b240
commit
e551e10a73
@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
|
|
||||||
import cn.hutool.json.JSONObject;
|
import cn.hutool.json.JSONObject;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.alibaba.fastjson.serializer.SerializerFeature;
|
||||||
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
|
||||||
import com.xdadan.erp.emis.domain.EmisWaybill;
|
import com.xdadan.erp.emis.domain.EmisWaybill;
|
||||||
import com.xdadan.erp.emis.utils.GZipUtils;
|
import com.xdadan.erp.emis.utils.GZipUtils;
|
||||||
@ -121,7 +122,8 @@ public class EmisCommissionDtlController extends BaseController
|
|||||||
List<Map> list = emisCommissionDtlService.selectCommissionDtlMapList(emisCommissionDtl);
|
List<Map> list = emisCommissionDtlService.selectCommissionDtlMapList(emisCommissionDtl);
|
||||||
if(emisCommissionDtl.getParams().containsKey("blExport")){
|
if(emisCommissionDtl.getParams().containsKey("blExport")){
|
||||||
List<String> exportList= new ArrayList<>();
|
List<String> 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) {
|
if(encStr!=null) {
|
||||||
exportList.add(encStr);
|
exportList.add(encStr);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user