Merge remote-tracking branch 'origin/master'
This commit is contained in:
+2
-2
@@ -516,7 +516,7 @@ public class StClientMemberBalanceController {
|
||||
|
||||
StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class);
|
||||
StClientMemberTransactionRecordVO stClientMemberTransactionRecordVO = new StClientMemberTransactionRecordVO();//只汇总交易金额
|
||||
stClientMemberTransactionRecordVO.setSerialNo("总计");
|
||||
stClientMemberTransactionRecordVO.setUserName("总计");
|
||||
stClientMemberTransactionRecordVO.setTransactionAmount(sumResult.getTransactionAmount());
|
||||
statisticsCanteenBusiness.add(stClientMemberTransactionRecordVO);
|
||||
|
||||
@@ -526,7 +526,7 @@ public class StClientMemberBalanceController {
|
||||
// "dinnerType|餐次名称,restName|食堂名称,createTime|交易时间,payTime|结账时间,updateStatusName|操作端,createOne|操作人";
|
||||
|
||||
String exportFields = "userName|姓名,workNo|工号,dinnerType|餐次名称,transactionAmount|交易金额,availableBalance|剩余金额,createTime|上传时间,serialNo|交易流水号,orderNo|交易单号,phone|手机号码,cardCode|卡号," +
|
||||
"statusName|操作类型,,paymentMethodName|结账方式,businessModelName|消费类型名称,storedBalance|储值金额变动(元)" +
|
||||
"statusName|操作类型,paymentMethodName|结账方式,businessModelName|消费类型名称,storedBalance|储值金额变动(元)," +
|
||||
"updateStatusName|操作端,payTime|扣费时间";
|
||||
// "dinnerType|餐次名称,restName|食堂名称,,payTime|结账时间,updateStatusName|操作端,createOne|操作人";
|
||||
ExcelUtils.export(response, "消费明细", statisticsCanteenBusiness, exportFields, "yyyy-MM-dd HH:mm",true);
|
||||
|
||||
Reference in New Issue
Block a user