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 2cdb0dec..68ce5428 100644 --- a/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java +++ b/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java @@ -55,13 +55,13 @@ 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); - if(!success){ - return R.error(); - } - return R.ok(); + + return success ? R.ok():R.error(); + } @@ -89,4 +89,11 @@ public class IndicatorLibraryController { } return R.ok(); } + + @PostMapping("/statistical") + @ApiOperation("统计指标") + public R statistical() { + //indicatorLibraryService + return R.ok(); + } } diff --git a/src/main/java/com/lz/modules/performance/controller/IndicatorTypeController.java b/src/main/java/com/lz/modules/performance/controller/IndicatorTypeController.java index 5c67bab6..dfcd1d06 100644 --- a/src/main/java/com/lz/modules/performance/controller/IndicatorTypeController.java +++ b/src/main/java/com/lz/modules/performance/controller/IndicatorTypeController.java @@ -50,10 +50,9 @@ public class IndicatorTypeController { } IndicatorType indicatorType = new IndicatorType(); BeanUtil.copyProperties(dto,indicatorType); - boolean success = indicatorTypeService.saveOrUpdate(indicatorType); - if(!success){ - return R.error(); - } - return R.ok(); + boolean success = indicatorTypeService.saveOrUpdate(indicatorType); + + return success ? R.ok():R.error(); + } } diff --git a/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java b/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java index a3729213..dc3b43e0 100644 --- a/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java @@ -10,6 +10,7 @@ package com.lz.modules.performance.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.lz.modules.performance.dto.IndicatorLibraryDto; +import com.lz.modules.performance.dto.StatisticalIndicatorTypeDto; import com.lz.modules.performance.entity.IndicatorLibrary; import com.lz.modules.performance.req.IndicatorLibraryReq; import org.apache.ibatis.annotations.Mapper; @@ -41,4 +42,5 @@ public interface IndicatorLibraryMapper extends BaseMapper { void updateIndicatorLibrarysMove(@Param("ids")List ids,@Param("indicatorType")Long indicatorType); + List statisticalByIndicatorType(); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dto/StatisticalIndicatorTypeDto.java b/src/main/java/com/lz/modules/performance/dto/StatisticalIndicatorTypeDto.java new file mode 100644 index 00000000..b78ff59e --- /dev/null +++ b/src/main/java/com/lz/modules/performance/dto/StatisticalIndicatorTypeDto.java @@ -0,0 +1,19 @@ +package com.lz.modules.performance.dto; + +import com.lz.modules.performance.entity.IndicatorType; +import lombok.Data; + +/** + * @Author: djc + * @Desc: + * @Date: 2021/1/13 17:20 + */ +@Data +public class StatisticalIndicatorTypeDto { + + private String name; + + private Integer indicatorType; + + private int count; +} diff --git a/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java b/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java index a4e61b5b..524552c9 100644 --- a/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java +++ b/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java @@ -3,9 +3,12 @@ package com.lz.modules.performance.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; 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 java.util.List; + /** *

* (设置)指标库 服务类 @@ -38,5 +41,7 @@ public interface IndicatorLibraryService extends IService { void updateIndicatorLibrarysMove(IndicatorLibraryMoveDto dto); + List statisticalByIndicatorType(); + } \ No newline at end of file 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 040009bf..a139aa05 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 @@ -6,6 +6,7 @@ import com.lz.common.utils.PageUtils; import com.lz.common.utils.StringUtil; import com.lz.modules.performance.dao.IndicatorLibraryMapper; 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; @@ -98,4 +99,13 @@ public class IndicatorLibraryServiceImpl extends ServiceImpl statisticalByIndicatorType() { + List dtos = indicatorLibraryMapper.statisticalByIndicatorType(); + for(StatisticalIndicatorTypeDto dto:dtos){ + + } + return null; + } } diff --git a/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml b/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml index b2e424d4..dc72521b 100644 --- a/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml +++ b/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml @@ -123,5 +123,12 @@ + + +