diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java index cacc9f8d..afdfeb4f 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java @@ -14,23 +14,16 @@ public class StatisticsVo { @ApiModel("查询小车本年和往年使用次数") public static class UseNumsVo { @ApiModelProperty("本年单月") - private List sigleNow; + private List sigleNow; @ApiModelProperty("本年和") - private List sumNow; + private List sumNow; @ApiModelProperty("去年单月") - private List sigleLast; + private List sigleLast; @ApiModelProperty("去年年和") - private List sumLast; - } - @Data - @ApiModel("一次查询出来得结果") - public static class UseNumVo { - @ApiModelProperty("年份") - private String name; - @ApiModelProperty("数量") - private Integer num; + private List sumLast; } + @Data @ApiModel("医院id") public static class FastEdResult{ diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java index d07196f2..eadd46fd 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java @@ -8,5 +8,5 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface StatisticsDao extends FirstAidMapper { - public List selResult(@Param("param")StatisticsDto.UseNum param); + public List selResult(@Param("param")StatisticsDto.UseNum param); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java index b932659a..339e17c9 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java @@ -27,31 +27,24 @@ public class StatisticsService implements IStatisticsService{ @Override public StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param) { StatisticsVo.UseNumsVo useNumsVo=new StatisticsVo.UseNumsVo(); - List useNumVoNow = statisticsDao.selResult(param); - List sumNow=new ArrayList(); + List useNumVoNow = statisticsDao.selResult(param); + List sumNow=new ArrayList(); sumNow.add(useNumVoNow.get(0)); for (int i = 1; i < useNumVoNow.size(); i++) { - StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo(); - useNumVo.setName(useNumVoNow.get(i).getName()); - useNumVo.setNum(useNumVoNow.get(i).getNum()+sumNow.get(i-1).getNum()); - sumNow.add(useNumVo); + sumNow.add(useNumVoNow.get(i)+sumNow.get(i-1)); } useNumsVo.setSigleNow(useNumVoNow); useNumsVo.setSumNow(sumNow); //往年得 - Integer yaer=Integer.valueOf(param.getYear()); yaer=yaer-1; param.setYear(String.valueOf(yaer)); - List useNumVosLast = statisticsDao.selResult(param); - List sumLast = new ArrayList(); + List useNumVosLast = statisticsDao.selResult(param); + List sumLast = new ArrayList(); sumLast.add(useNumVosLast.get(0)); for (int i = 1; i < useNumVosLast.size(); i++) { - StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo(); - useNumVo.setName(useNumVosLast.get(i).getName()); - useNumVo.setNum(useNumVosLast.get(i).getNum()+sumLast.get(i-1).getNum()); - sumLast.add(useNumVo); + sumLast.add(useNumVosLast.get(i)+sumLast.get(i-1)); } useNumsVo.setSigleLast(useNumVosLast); useNumsVo.setSumLast(sumLast); diff --git a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml index d2242678..8a316a51 100644 --- a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml @@ -2,8 +2,8 @@ - + select if(tfa.num is NULL,0,tfa.num) as num FROM (SELECT concat( #{param.year}, `name` ) AS `name` FROM