diff --git a/mallinkService/src/main/java/com/iformall/service/excel/WxCardDataExporter.java b/mallinkService/src/main/java/com/iformall/service/excel/WxCardDataExporter.java index 33beab8a6..8683131ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/excel/WxCardDataExporter.java +++ b/mallinkService/src/main/java/com/iformall/service/excel/WxCardDataExporter.java @@ -1,15 +1,18 @@ package com.iformall.service.excel; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; +import com.iformall.domain.vo.excel.WxCardData; import com.iformall.mapper.WxCouponMapper; import cn.afterturn.easypoi.handler.inter.IExcelExportServer; @@ -38,9 +41,22 @@ public class WxCardDataExporter implements IExcelExportServer { List list = wxCouponMapper.findCountData((List)map.get("tenantEntitys"),record); if (null != list && list.size() > 0 ) { - List retList = new ArrayList(); - retList.addAll(list); - return retList; + List cardList = new ArrayList(); + for (WxCouponStatisVo v : list) { + WxCardData d = new WxCardData(); + try { + BeanUtils.copyProperties(d, v); + cardList.add(d); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + } + + List retList = new ArrayList(); + retList.addAll(cardList); + return retList; } return null; diff --git a/mallinkService/src/main/java/com/iformall/service/excel/WxCouponDataExporter.java b/mallinkService/src/main/java/com/iformall/service/excel/WxCouponDataExporter.java index ee7f995b9..593c00fd9 100644 --- a/mallinkService/src/main/java/com/iformall/service/excel/WxCouponDataExporter.java +++ b/mallinkService/src/main/java/com/iformall/service/excel/WxCouponDataExporter.java @@ -1,15 +1,18 @@ package com.iformall.service.excel; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; +import com.iformall.domain.vo.excel.WxCouponData; import com.iformall.mapper.WxCouponMapper; import cn.afterturn.easypoi.handler.inter.IExcelExportServer; @@ -38,8 +41,21 @@ public class WxCouponDataExporter implements IExcelExportServer { List list = wxCouponMapper.findCouponData((List)map.get("tenantEntitys"),record); if (null != list && list.size() > 0 ) { + List cardList = new ArrayList(); + for (WxCouponStatisVo v : list) { + WxCouponData d = new WxCouponData(); + try { + BeanUtils.copyProperties(d, v); + cardList.add(d); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + } + List retList = new ArrayList(); - retList.addAll(list); + retList.addAll(cardList); return retList; } diff --git a/mallinkService/src/main/java/com/iformall/service/excel/WxPressDataExporter.java b/mallinkService/src/main/java/com/iformall/service/excel/WxPressDataExporter.java index 90353bf59..ace7f5d4c 100644 --- a/mallinkService/src/main/java/com/iformall/service/excel/WxPressDataExporter.java +++ b/mallinkService/src/main/java/com/iformall/service/excel/WxPressDataExporter.java @@ -1,15 +1,19 @@ package com.iformall.service.excel; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.commons.beanutils.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; +import com.iformall.domain.vo.excel.WxCouponData; +import com.iformall.domain.vo.excel.WxPressData; import com.iformall.mapper.WxCouponMapper; import cn.afterturn.easypoi.handler.inter.IExcelExportServer; @@ -38,8 +42,21 @@ public class WxPressDataExporter implements IExcelExportServer { List list = wxCouponMapper.findPressData((List)map.get("tenantEntitys"),record); if (null != list && list.size() > 0 ) { + List cardList = new ArrayList(); + for (WxCouponStatisVo v : list) { + WxPressData d = new WxPressData(); + try { + BeanUtils.copyProperties(d, v); + cardList.add(d); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + } + List retList = new ArrayList(); - retList.addAll(list); + retList.addAll(cardList); return retList; }