|
@@ -57,7 +57,7 @@ public class HomeController {
|
|
|
@ApiOperation("首页数据块")
|
|
|
public HomeBlocks block(String deptId) {
|
|
|
|
|
|
- if(StringUtils.isBlank(deptId)){
|
|
|
+ if (StringUtils.isBlank(deptId)) {
|
|
|
throw new ServiceException("部门Id不能为空");
|
|
|
}
|
|
|
|
|
@@ -86,12 +86,12 @@ public class HomeController {
|
|
|
|
|
|
//块
|
|
|
HomeBlocks homeBlocks = new HomeBlocks();
|
|
|
- if(blockOrder.size()>1){
|
|
|
+ if (blockOrder.size() > 1) {
|
|
|
Optional<Integer> orderNumMax = blockOrder.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getOrderNum()).orElse(MassageConstants.INTEGER_ZERO));
|
|
|
homeBlocks.setOrderNum(orderNumMax.orElse(MassageConstants.INTEGER_ZERO));
|
|
|
Optional<BigDecimal> turnover = blockOrder.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getTurnover()).orElse(BigDecimal.ZERO));
|
|
|
homeBlocks.setTurnover(turnover.orElse(BigDecimal.ZERO));
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
homeBlocks.setOrderNum(MassageConstants.INTEGER_ZERO);
|
|
|
homeBlocks.setTurnover(BigDecimal.ZERO);
|
|
|
}
|
|
@@ -103,11 +103,10 @@ public class HomeController {
|
|
|
homeBlocks.setUpTurnover(upTurnover.orElse(BigDecimal.ZERO));
|
|
|
|
|
|
|
|
|
-
|
|
|
- if(blockAmount.size()>1){
|
|
|
+ if (blockAmount.size() > 1) {
|
|
|
Optional<BigDecimal> getAmountMax = blockAmount.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getGetAmount()).orElse(BigDecimal.ZERO));
|
|
|
homeBlocks.setGetAmount(getAmountMax.orElse(BigDecimal.ZERO));
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
homeBlocks.setGetAmount(BigDecimal.ZERO);
|
|
|
}
|
|
|
Optional<BigDecimal> getupAmount = blockAmount.stream().min(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getGetAmount()).orElse(BigDecimal.ZERO));
|
|
@@ -120,8 +119,10 @@ public class HomeController {
|
|
|
if (CollectionUtil.isEmpty(currentUser)) {
|
|
|
homeBlocks.setUpUserNum(sumUser);
|
|
|
} else {
|
|
|
- homeBlocks.setUpUserNum(sumJs - currentUser.get(0).getUserNum());
|
|
|
+ homeBlocks.setUpUserNum(sumUser - currentUser.get(0).getUserNum());
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
homeBlocks.setJsNum(sumJs);
|
|
|
//获取当前月新增的教练数量
|
|
|
List<HomeBlock> currentHomeBlock = blockJs.stream().filter(i -> i.getMonth().equals(currentMonth)).collect(Collectors.toList());
|
|
@@ -139,7 +140,7 @@ public class HomeController {
|
|
|
@GetMapping("columnar")
|
|
|
@ApiOperation("首页柱状图")
|
|
|
public List<HashMap<String, Object>> columnar(String deptId) {
|
|
|
- if(StringUtils.isBlank(deptId)){
|
|
|
+ if (StringUtils.isBlank(deptId)) {
|
|
|
throw new ServiceException("部门Id不能为空");
|
|
|
}
|
|
|
//获取上个年时间
|
|
@@ -164,7 +165,7 @@ public class HomeController {
|
|
|
Map<String, List<HomeBlock>> blockMap = blockOrder.stream().collect(Collectors.groupingBy(HomeBlock::getMonth));
|
|
|
|
|
|
ArrayList<HashMap<String, Object>> blockM = Lists.newArrayList();
|
|
|
- blockMap.forEach((k, v)->{
|
|
|
+ blockMap.forEach((k, v) -> {
|
|
|
|
|
|
HashMap<String, Object> homeBlockMap = new HashMap<>();
|
|
|
|
|
@@ -201,11 +202,11 @@ public class HomeController {
|
|
|
|
|
|
@GetMapping("ranking")
|
|
|
@ApiOperation("首页排名")
|
|
|
- public List<TJsDay> ranking(String deptId,String start,String end) {
|
|
|
- if(StringUtils.isBlank(deptId)){
|
|
|
+ public List<TJsDay> ranking(String deptId, String start, String end) {
|
|
|
+ if (StringUtils.isBlank(deptId)) {
|
|
|
throw new ServiceException("部门Id不能为空");
|
|
|
}
|
|
|
- return jsDayMapper.selectRanking(null,deptId, start, end);
|
|
|
+ return jsDayMapper.selectRanking(null, deptId, start, end);
|
|
|
}
|
|
|
|
|
|
|