diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java index ac7c882a3..87e0043b8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java @@ -17,7 +17,7 @@ public class CUserBaseInfoT implements Serializable { @Excel(name="性别",width = 20,replace = { "保密_0", "男_1","女_2"},orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="性别:0:保密 1.男 2女",name="sex") private Integer sex; - @Excel(name = "手机号*", width = 20, orderNum = "3") + @Excel(name = "手机号", width = 20, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="微信用户绑定的手机号",name="phone") @NotNull @Pattern(regexp = "1[0123456789]\\d{9}", message = "手机号不正确") @@ -31,26 +31,26 @@ public class CUserBaseInfoT implements Serializable { @Excel(name="生日",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="出生日期",name="birthdate") private String birthdate; - @Excel(name = "积分", width = 20, orderNum = "12") + @Excel(name = "积分", width = 20, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private String credit; - @Excel(name = "地址", width = 20, orderNum = "7") + @Excel(name = "地址", width = 20, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="地址",name="address") private String address; - @Excel(name = "上次活跃时间", width = 20, orderNum = "8") + @Excel(name = "上次活跃时间", width = 20, orderNum = "9") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private String updateDate; - @Excel(name = "注册时间", width = 20, orderNum = "9") + @Excel(name = "注册时间", width = 20, orderNum = "10") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private String createDate; @Transient - @Excel(name = "标签", width = 20, orderNum = "10") + @Excel(name = "标签", width = 20, orderNum = "11") private String tagNames; @Transient - @Excel(name = "成长值", width = 20, orderNum = "11") + @Excel(name = "成长值", width = 20, orderNum = "12") private String poins; } 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 61ddce816..63d9b3edd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -627,60 +627,79 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { excelService.exportExcel(list, null, "会员信息", WxCUserBasicInfoVo.class, "会员信息数据.xlsx", response, false); } - @Override public void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId) { - List list = new ArrayList<>(); - CUserBaseInfoT u1 = new CUserBaseInfoT(); - CUserBaseInfoT u2 = new CUserBaseInfoT(); - CUserBaseInfoT u3 = new CUserBaseInfoT(); + List list = new ArrayList<>(); + WxCUserBasicInfoVo u1 = new WxCUserBasicInfoVo(); + WxCUserBasicInfoVo u2 = new WxCUserBasicInfoVo(); + WxCUserBasicInfoVo u3 = new WxCUserBasicInfoVo(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + u1.setName("例子1"); u1.setSex(0); u1.setPhone("13900010001"); u1.setNickName("昵称"); u1.setEducation("本科"); - u1.setCredit("10"); + u1.setCredit(10); u1.setAddress("地址"); - u1.setBirthdate("2018-09-10"); - u1.setCreateDate("2018-08-10"); - u1.setUpdateDate("2018-08-10"); - + try { + u1.setBirthdate(sdf.parse("2018-09-10")); + u1.setCreateDate(sdf.parse("2018-08-10")); + u1.setUpdateDate(sdf.parse("2018-08-10")); + } catch (Exception e) { + u1.setBirthdate(new Date()); + u1.setCreateDate(new Date()); + u1.setUpdateDate(new Date()); + } u1.setTagNames("附近住户"); - u1.setPoins("100"); + u1.setPoins(100); u2.setName("例子2"); u2.setSex(1); u2.setPhone("13900010002"); u2.setNickName("昵称"); u2.setEducation("本科"); - u2.setCredit("20"); + u2.setCredit(20); u2.setAddress("地址"); - u2.setBirthdate("2018-09-10"); - u2.setCreateDate("2018-08-10"); - u2.setUpdateDate("2018-08-10"); + try { + u2.setBirthdate(sdf.parse("2018-09-10")); + u2.setCreateDate(sdf.parse("2018-08-10")); + u2.setUpdateDate(sdf.parse("2018-08-10")); + } catch (Exception e) { + u2.setBirthdate(new Date()); + u2.setCreateDate(new Date()); + u2.setUpdateDate(new Date()); + } u2.setTagNames("男/附近住户"); - u2.setPoins("200"); + u2.setPoins(200); u3.setName("例子3"); u3.setSex(2); u3.setPhone("13900010003"); u3.setNickName("昵称"); u3.setEducation("本科"); - u3.setCredit("30"); + u3.setCredit(30); u3.setAddress("地址"); - u3.setBirthdate("2018-09-10"); - u3.setCreateDate("2018-08-10"); - u3.setUpdateDate("2018-08-10"); + try { + u3.setBirthdate(sdf.parse("2018-09-10")); + u3.setCreateDate(sdf.parse("2018-08-10")); + u3.setUpdateDate(sdf.parse("2018-08-10")); + } catch (Exception e) { + u3.setBirthdate(new Date()); + u3.setCreateDate(new Date()); + u3.setUpdateDate(new Date()); + } u3.setTagNames("女/附近住户"); - u3.setPoins("110"); + u3.setPoins(110); + list.add(u1); list.add(u2); list.add(u3); - excelService.exportExcel(list, null, "会员信息模板", CUserBaseInfoT.class, "会员信息模板.xlsx", response, true); + excelService.exportExcel(list, null, "会员信息模板", WxCUserBasicInfoVo.class, "会员信息模板.xlsx", response, true); }