From e9cd5c0024dfc522e7e12063c67b7db4c81724b8 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 2 Apr 2019 22:44:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BC=9A=E5=91=98=E5=AF=BC=E5=87=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCUserBasicInfo.java | 2 +- .../main/java/com/iformall/mapper/WxTagsMapper.java | 2 ++ .../iformall/service/impl/WxBillAllServiceImpl.java | 2 +- .../service/impl/WxCUserBasicInfoServiceImpl.java | 13 +++++++++++-- .../src/main/resources/mapper/WxTagsMapper.xml | 3 +++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 0429fbc4b..58ca8d3a7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -116,7 +116,7 @@ public class WxCUserBasicInfo implements Serializable { @Transient - @Excel(name="标签",width = 20,orderNum = "10") + @Excel(name="标签",width = 50,orderNum = "10") private String tagNames; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java index dbb6aafe9..ede14b761 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java @@ -4,9 +4,11 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxTags; import java.util.List; +import java.util.Map; public interface WxTagsMapper extends CommonMapper { List findList(WxTags wxTags); + List findListAll(); List getByName(String name); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index bc2cc6988..06c1cb452 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -207,7 +207,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { WxBillAllVo first = ((List)(entry.getValue())).get(0); deptExportParams.setSheetName(first.getMerchantName()); deptExportParams.setTitle(first.getMerchantName() - + "(" + + " (" + EnumRentShopType.getEnum((Integer)first.getRentShopType()).getMessage() + "-"+first.getShopNumber() + ")"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 5f55f7314..a388ea2e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -33,6 +34,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Service public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @@ -148,6 +150,14 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { public void exportData(WxCUserBasicInfo basicInfo, HttpServletRequest request, HttpServletResponse response) { List list = wxCUserBasicInfoMapper.findVoList(basicInfo); + List tagList = wxTagsMapper.findListAll(); + Map tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName)); + list.stream().filter(u->u.getTags()!=null).forEach(u->{ + logger.debug("$$$$$ID:" + u.getId().toString()); + List ids = JSONObject.parseArray(u.getTags(), Long.class); + String tagNames = StringUtils.join(ids.stream().map(id->tagMap.get(id)).collect(Collectors.toList()),"/"); + u.setTagNames(tagNames); + }); excelService.exportExcel(list,null,"会员信息",WxCUserBasicInfoVo.class,"会员信息数据.xls",response); } /* @@ -166,8 +176,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - WxTags wxTagsQ = new WxTags(); - List tagList = wxTagsMapper.findList(wxTagsQ); + List tagIdList = new ArrayList(); diff --git a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml index a920fdc2a..ccabccc2b 100644 --- a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml @@ -64,4 +64,7 @@ and `name` = #{name} +