diff --git a/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java b/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java index 68ce5428..fa5d6aba 100644 --- a/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java +++ b/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java @@ -8,6 +8,7 @@ import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; import com.lz.modules.performance.dto.IndicatorLibraryDto; import com.lz.modules.performance.dto.IndicatorLibraryMoveDto; +import com.lz.modules.performance.dto.StatisticalIndicatorTypeDto; import com.lz.modules.performance.entity.IndicatorLibrary; import com.lz.modules.performance.req.IndicatorLibraryReq; import com.lz.modules.performance.service.IndicatorLibraryService; @@ -15,12 +16,29 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.aopalliance.aop.Advice; import org.apache.ibatis.annotations.Param; +import org.springframework.aop.Advisor; +import org.springframework.aop.AfterReturningAdvice; +import org.springframework.aop.framework.adapter.AdvisorAdapter; +import org.springframework.aop.framework.adapter.AfterReturningAdviceInterceptor; +import org.springframework.aop.framework.adapter.UnknownAdviceTypeException; +import org.springframework.aop.support.DefaultPointcutAdvisor; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; +import javax.annotation.PostConstruct; +import java.io.Serializable; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @RestController @@ -55,7 +73,6 @@ public class IndicatorLibraryController { @PostMapping("/saveOrUpdate") @ApiOperation("保存/修改指标") public R save(@RequestBody IndicatorLibraryDto dto) { - IndicatorLibrary indicatorLibrary = new IndicatorLibrary(); BeanUtil.copyProperties(dto,indicatorLibrary); boolean success = indicatorLibraryService.saveOrUpdate(indicatorLibrary); @@ -93,7 +110,8 @@ public class IndicatorLibraryController { @PostMapping("/statistical") @ApiOperation("统计指标") public R statistical() { - //indicatorLibraryService - return R.ok(); + List dtos = indicatorLibraryService.statisticalByIndicatorType(); + return R.ok().put("data",dtos); } } + diff --git a/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java index a139aa05..4a510c1b 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java @@ -17,6 +17,8 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; +import java.util.Optional; +import java.util.function.ToDoubleFunction; /** *

@@ -103,9 +105,15 @@ public class IndicatorLibraryServiceImpl extends ServiceImpl statisticalByIndicatorType() { List dtos = indicatorLibraryMapper.statisticalByIndicatorType(); - for(StatisticalIndicatorTypeDto dto:dtos){ - + StatisticalIndicatorTypeDto dto = new StatisticalIndicatorTypeDto(); + dto.setName("全部分类"); + dto.setIndicatorType(null); + if(CollectionUtils.isNotEmpty(dtos)){ + double sum = dtos.stream().mapToDouble(value -> value.getCount()).sum(); + dto.setCount(Double.valueOf(sum).intValue()); } - return null; + //加入首位 + dtos.add(0,dto); + return dtos; } } diff --git a/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml b/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml index dc72521b..0eae2f7a 100644 --- a/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml +++ b/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml @@ -125,8 +125,9 @@