This commit is contained in:
linfso 2025-07-10 17:39:39 +08:00
parent a2799b4e52
commit 2305e25931
2 changed files with 8 additions and 8 deletions

View File

@ -59,6 +59,11 @@ public class EmisBaseController extends BaseController
} }
} }
/**
* 导出数据压缩
* @param list
* @return
*/
public List getCompressExportList(List list){ public List getCompressExportList(List list){
List<String> exportList= new ArrayList<>(); List<String> exportList= new ArrayList<>();
JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";

View File

@ -57,7 +57,7 @@ import com.xdadan.erp.emis.service.IEmisCommissionDtlService;
*/ */
@RestController @RestController
@RequestMapping("/emis/emisCommissionDtl") @RequestMapping("/emis/emisCommissionDtl")
public class EmisCommissionDtlController extends BaseController public class EmisCommissionDtlController extends EmisBaseController
{ {
@Autowired @Autowired
private IEmisCommissionDtlService emisCommissionDtlService; private IEmisCommissionDtlService emisCommissionDtlService;
@ -120,13 +120,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("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);