diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java index a529523..6ffc84c 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java @@ -7,87 +7,87 @@ import java.util.List; public class WxUserMemberExport { - /** - * id - */ - @Excel(name = "用户编号") - private Long id; - /** * 昵称 */ - @Excel(name = "会员昵称") + @Excel(name = "会员昵称", sort = 1) private String nickname; /** - * 积分 + * id */ - @Excel(name = "积分") - private Integer credit; + @Excel(name = "用户编号", sort = 2) + private Long id; /** - * 即将过期积分 + * 手机 */ - @Excel(name = "即将过期积分") - private Integer expireCredit; + @Excel(name = "手机号码", sort = 3) + private String mobile; /** - * unionid + * 生日 */ - @Excel(name = "unionid") - private String unionid; + @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd", sort = 4) + private Date birthday; - /** - * 手机 - */ - @Excel(name = "手机号") - private String mobile; /** * 省 */ - @Excel(name = "省") + @Excel(name = "省", sort = 5) private String province; /** * 市 */ - @Excel(name = "市") + @Excel(name = "市", sort = 6) private String city; /** * 区 */ - @Excel(name = "区") + @Excel(name = "区", sort = 7) private String area; /** - * 生日 + * 创建时间 */ - @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd") - private Date birthday; - + @Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 8) + private Date createTime; /** * 绑定的仪器数量 */ - @Excel(name = "仪器数量") + @Excel(name = "仪器数量", sort = 9) private Integer devicesNum; - @Excel(name = "仪器名称") - private String devicesName; + @Excel(name = "小程序标签", sort = 10) + String miniProgramTags; + + @Excel(name = "外部标签", sort = 11) + String wecomTags; /** - * 创建时间 + * 积分 */ - @Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + @Excel(name = "积分", sort = 12) + private Integer credit; - @Excel(name = "外部标签") - String wecomTags; + /** + * 即将过期积分 + */ + @Excel(name = "即将过期积分", sort = 13) + private Integer expireCredit; - @Excel(name = "小程序标签") - String miniProgramTags; + /** + * unionid + */ + @Excel(name = "unionid", sort = 14) + private String unionid; + + @Excel(name = "仪器名称", sort = 15) + private String devicesName; public WxUserMemberExport() { diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java index 9b360b9..be5e161 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java @@ -68,6 +68,11 @@ public class WxUserMemberVm extends BaseEntity { */ private Date birthday; + /** + * 生日 + */ + private List birthdayRange; + /** * 用户注册起始时间 */ @@ -298,4 +303,12 @@ public class WxUserMemberVm extends BaseEntity { public void setDevicesIdList(List devicesIdList) { this.devicesIdList = devicesIdList; } + + public List getBirthdayRange() { + return birthdayRange; + } + + public void setBirthdayRange(List birthdayRange) { + this.birthdayRange = birthdayRange; + } } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index 8aff65f..7264723 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -382,6 +382,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and member.city_id = #{cityId} and member.area_id = #{areaId} and member.birthday = #{birthday} + + + and member.birthday >= #{birthdayRange[0]} + and member.birthday <= #{birthdayRange[1]} + and
+ + + + + + + + + @@ -1585,6 +1596,7 @@ export default { areaId: null, area: null, birthday: null, + birthdayRange: [], clock: null, activity: null, wechat: null, @@ -1987,6 +1999,7 @@ export default { area: null, areaId: null, birthday: null, + birthdayRange: [], clock: null, activity: null, wechat: null, @@ -2031,6 +2044,7 @@ export default { areaId: null, area: null, birthday: null, + birthdayRange: [], clock: null, activity: null, wechat: null,