Просмотр исходного кода

[积分变更记录][修改][导出数据优化]

release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
2202b1a9d5
2 измененных файлов: 5 добавлений и 8 удалений
  1. +0
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  2. +5
    -1
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml

+ 0
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Просмотреть файл

@@ -89,9 +89,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
@Override
public void exportData(HttpServletRequest request, HttpServletResponse response, WxCreditHistory wxCreditHistory) {
List<WxCreditHistoryVo> wxCreditHistoryVoList = wxCreditHistoryMapper.findListMore(wxCreditHistory);
if (!wxCreditHistoryVoList.isEmpty()) {
supplyCreditInfo(wxCreditHistoryVoList);
}
excelService.exportExcel(wxCreditHistoryVoList, null, "积分变更记录", WxCreditHistoryVo.class, "积分变更记录.xlsx", response, false);

}
@@ -119,10 +116,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
public PageInfo<WxCreditHistoryVo> listAsPageMore(WxCreditHistory record, Integer pageIndex, Integer pageSize) {
PageHelper.startPage(pageIndex, pageSize);
List<WxCreditHistoryVo> wxCreditHistoryVoList = wxCreditHistoryMapper.findListMore(record);
if (wxCreditHistoryVoList == null || wxCreditHistoryVoList.size() == 0) {
return new PageInfo<>(wxCreditHistoryVoList);
}
supplyCreditInfo(wxCreditHistoryVoList);
return new PageInfo<>(wxCreditHistoryVoList);
}



+ 5
- 1
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml Просмотреть файл

@@ -150,7 +150,11 @@
credit.operator_id operatorId,
merchant.NAME merchantName,
credit.merchant_id merchantId,
credit.ticket_number ticketNumber
credit.ticket_number ticketNumber,
case when credit.operator_type=4 then (select name from mall_user_info where id=credit.operator_id)
when credit.operator_type=3 then (select name from wx_merchant_b_user where id=credit.operator_id)
when credit.operator_type=1 then (select nick_name from wx_c_user where id=credit.operator_id)
else '' end operator
FROM
wx_c_user_basic_info basic
INNER JOIN wx_credit_history credit ON basic.id = credit.c_user_id


Загрузка…
Отмена
Сохранить