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:39:39 +08:00
parent a2799b4e52
commit 2305e25931
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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";

11
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java
View File

@ -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);