导出修改
This commit is contained in:
@ -207,7 +207,10 @@ public class EarningsCalculateController {
|
|||||||
String lang = req.getHeader(CommonConstant.LANG);
|
String lang = req.getHeader(CommonConstant.LANG);
|
||||||
earningsCalculateReq.setLang(lang);
|
earningsCalculateReq.setLang(lang);
|
||||||
EarningsCalculateResp total = earningsCalculateService.getTotal(earningsCalculateReq,PAGE_LIST_TYPE);
|
EarningsCalculateResp total = earningsCalculateService.getTotal(earningsCalculateReq,PAGE_LIST_TYPE);
|
||||||
|
if(total.getCharge()==null){
|
||||||
|
total.setCharge(new ArrayList<>());
|
||||||
|
total.setDischarge(new ArrayList<>());
|
||||||
|
}
|
||||||
ServletOutputStream out = null;
|
ServletOutputStream out = null;
|
||||||
try {
|
try {
|
||||||
out = response.getOutputStream();
|
out = response.getOutputStream();
|
||||||
@ -326,7 +329,10 @@ public class EarningsCalculateController {
|
|||||||
String lang = req.getHeader(CommonConstant.LANG);
|
String lang = req.getHeader(CommonConstant.LANG);
|
||||||
earningsCalculateReq.setLang(lang);
|
earningsCalculateReq.setLang(lang);
|
||||||
EarningsCalculateResp total = earningsCalculateService.getTotal(earningsCalculateReq,REPORT_LIST_TYPE);
|
EarningsCalculateResp total = earningsCalculateService.getTotal(earningsCalculateReq,REPORT_LIST_TYPE);
|
||||||
|
if(total.getCharge()==null){
|
||||||
|
total.setCharge(new ArrayList<>());
|
||||||
|
total.setDischarge(new ArrayList<>());
|
||||||
|
}
|
||||||
ServletOutputStream out = null;
|
ServletOutputStream out = null;
|
||||||
try {
|
try {
|
||||||
out = response.getOutputStream();
|
out = response.getOutputStream();
|
||||||
|
|||||||
Reference in New Issue
Block a user