From 5a791fe90eeb5918d76a7fe6b761db736d7c083d Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 15:19:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=BB=93=E6=9E=84][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 32 +++++++++---------- .../simple/domain/dto/WxCuerBasicInfoDto.java | 21 ++++++++++++ .../com/simple/domain/vo/UserStructureVo.java | 8 +++++ .../java/com/simple/enums/EnumAgeInfo.java | 8 ++--- .../mapper/WxCUserBasicInfoMapper.xml | 13 ++++++-- 5 files changed, 59 insertions(+), 23 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index eed3b4a2e..ba527055a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -217,17 +217,19 @@ public class WxCUserBasicInfoController extends BaseController long girl=getCount(dto); Long all =secrecy+boy+girl; List vos = new ArrayList<>(); - vos.add(getVo(boy, all, "男")); - vos.add(getVo(girl, all, "女")); - vos.add(getVo(secrecy, all, "保密")); + vos.add(getVo(boy, all, "男",1)); + vos.add(getVo(girl, all, "女",2)); + vos.add(getVo(secrecy, all, "保密",3)); return new ResultData(vos); } @ApiOperation("查询会员年龄结构") @GetMapping("/findUserAgeStructure") - public ResultData findUserAgeStructure() { - - long all =wxCUserBasicInfoService.findCountByAge(new WxCuerBasicInfoDto()); + public ResultData findUserAgeStructure( Date startTime,Date endTime) { + WxCuerBasicInfoDto dto = new WxCuerBasicInfoDto(); + dto.setStartTime(startTime); + dto.setEndTime(endTime); + long all =wxCUserBasicInfoService.findCountByAge(dto); List vos = new ArrayList<>(); Calendar c = Calendar.getInstance(); for(EnumAgeInfo a:EnumAgeInfo.values()) { @@ -236,25 +238,22 @@ public class WxCUserBasicInfoController extends BaseController c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE,0); c.set(Calendar.SECOND,0); - long count = getCountByAge(a, c); - vos.add(getVo(count, all, a.getDesc())); + long count = getCountByAge(a, c,dto); + vos.add(getVo(count, all, a.getDesc(),a.getSortNum())); } - - - return new ResultData(); + return new ResultData(vos); } - private long getCountByAge(EnumAgeInfo a,Calendar c) { - WxCuerBasicInfoDto dto =new WxCuerBasicInfoDto(); + private long getCountByAge(EnumAgeInfo a,Calendar c, WxCuerBasicInfoDto dto ) { c.add(Calendar.YEAR, -a.getEnd()); Date startTime = c.getTime(); c.clear(); c.setTime(startTime); c.add(Calendar.YEAR,a.getEnd()-a.getStart()); Date endTime = c.getTime(); - dto.setStartTime(startTime); - dto.setEndTime(endTime); + dto.setBirthStartTime(startTime); + dto.setBirthEndTime(endTime); return wxCUserBasicInfoService.findCountByAge(dto); } @@ -266,8 +265,9 @@ public class WxCUserBasicInfoController extends BaseController wxCUserService.findCountBySex(dto); } - private UserStructureVo getVo(long count,long all,String name) { + private UserStructureVo getVo(long count,long all,String name,Integer num) { UserStructureVo vo = new UserStructureVo(); + vo.setSortNum(num); vo.setName(name); vo.setCount(count+""); NumberFormat nf = NumberFormat.getPercentInstance(); diff --git a/mallinkService/src/main/java/com/simple/domain/dto/WxCuerBasicInfoDto.java b/mallinkService/src/main/java/com/simple/domain/dto/WxCuerBasicInfoDto.java index 7c06f2a9b..3507f64a8 100644 --- a/mallinkService/src/main/java/com/simple/domain/dto/WxCuerBasicInfoDto.java +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxCuerBasicInfoDto.java @@ -32,10 +32,31 @@ public class WxCuerBasicInfoDto implements Serializable{ // @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") @Transient private String tenantId; + + @Transient + private Date birthStartTime; + @Transient + private Date birthEndTime; @Transient private Integer sex; + public Date getBirthStartTime() { + return birthStartTime; + } + + public void setBirthStartTime(Date birthStartTime) { + this.birthStartTime = birthStartTime; + } + + public Date getBirthEndTime() { + return birthEndTime; + } + + public void setBirthEndTime(Date birthEndTime) { + this.birthEndTime = birthEndTime; + } + public Integer getSex() { return sex; } diff --git a/mallinkService/src/main/java/com/simple/domain/vo/UserStructureVo.java b/mallinkService/src/main/java/com/simple/domain/vo/UserStructureVo.java index 1ecf44e4b..84db123d6 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/UserStructureVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/UserStructureVo.java @@ -18,6 +18,14 @@ public class UserStructureVo implements Serializable{ private String count; //百分比 private String percentage; + //序号 + private Integer sortNum; + public Integer getSortNum() { + return sortNum; + } + public void setSortNum(Integer sortNum) { + this.sortNum = sortNum; + } public String getName() { return name; } diff --git a/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java b/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java index 15e14a346..7a10a0ab3 100644 --- a/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java +++ b/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java @@ -3,10 +3,10 @@ package com.simple.enums; public enum EnumAgeInfo { FIRST_SLOT(1,0,18,"18岁以下"), SECOND_SLOT(2,18,24,"18岁-24岁"), - THIRD_SLOT(3,18,24,"25岁-34岁"), - FOURTH_SLOT(4,18,24,"35岁-44岁"), - FIFTH_SLOT(5,18,24,"45岁-54岁"), - SIXTH_SLOT(6,18,24,"55岁-60岁"), + THIRD_SLOT(3,25,34,"25岁-34岁"), + FOURTH_SLOT(4,35,44,"35岁-44岁"), + FIFTH_SLOT(5,45,54,"45岁-54岁"), + SIXTH_SLOT(6,54,60,"55岁-60岁"), SEVENTH_SLOT(7,18,24,"60岁以上") ; diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index f127b6edf..b0a3ba3ed 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -153,12 +153,19 @@