wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
DirectionOfMind 2021-01-20 11:26:39 +08:00
parent 0e43d5b9dc
commit 1ed80a054e
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java
View File

@ -7,15 +7,14 @@ import com.google.common.collect.Maps;
import com.lz.common.utils.PageUtils; import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R; import com.lz.common.utils.R;
import com.lz.common.utils.StringUtil; import com.lz.common.utils.StringUtil;
import com.lz.modules.flow.entity.FlowStart;
import com.lz.modules.performance.dto.IndicatorLibraryDto; import com.lz.modules.performance.dto.IndicatorLibraryDto;
import com.lz.modules.performance.dto.IndicatorLibraryMoveDto; import com.lz.modules.performance.dto.IndicatorLibraryMoveDto;
import com.lz.modules.performance.dto.StatisticalIndicatorTypeDto; import com.lz.modules.performance.dto.StatisticalIndicatorTypeDto;
import com.lz.modules.performance.entity.IndicatorLibrary; import com.lz.modules.performance.entity.IndicatorLibrary;
import com.lz.modules.performance.req.IndicatorLibraryReq; import com.lz.modules.performance.req.IndicatorLibraryReq;
import com.lz.modules.performance.service.IndicatorLibraryService; import com.lz.modules.performance.service.IndicatorLibraryService;
import io.swagger.annotations.Api; import io.swagger.annotations.*;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aopalliance.aop.Advice; import org.aopalliance.aop.Advice;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -111,6 +110,7 @@ public class IndicatorLibraryController {
@GetMapping("/statistical") @GetMapping("/statistical")
@ApiOperation("统计指标") @ApiOperation("统计指标")
@ApiResponses({@ApiResponse(code = 200, message = "成功", response = StatisticalIndicatorTypeDto.class)})
public R statistical(@RequestParam(name = "indicatorType",required = false) @ApiParam(value = "指标分类id",name = "indicatorType") Long indicatorType) { public R statistical(@RequestParam(name = "indicatorType",required = false) @ApiParam(value = "指标分类id",name = "indicatorType") Long indicatorType) {
List<StatisticalIndicatorTypeDto> dtos = indicatorLibraryService.statisticalByIndicatorType(indicatorType); List<StatisticalIndicatorTypeDto> dtos = indicatorLibraryService.statisticalByIndicatorType(indicatorType);
return R.ok().put("data",dtos); return R.ok().put("data",dtos);

9
src/main/java/com/lz/modules/performance/dto/StatisticalIndicatorTypeDto.java
View File

@ -1,6 +1,8 @@
package com.lz.modules.performance.dto; package com.lz.modules.performance.dto;
import com.lz.modules.performance.entity.IndicatorType; import com.lz.modules.performance.entity.IndicatorType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
@ -9,11 +11,18 @@ import lombok.Data;
* @Date: 2021/1/13 17:20 * @Date: 2021/1/13 17:20
*/ */
@Data @Data
@ApiModel("统计响应实体")
public class StatisticalIndicatorTypeDto { public class StatisticalIndicatorTypeDto {
@ApiModelProperty(value = "名称",name = "name")
private String name; private String name;
@ApiModelProperty(value = "类型",name = "indicatorType")
private Integer indicatorType; private Integer indicatorType;
@ApiModelProperty(value = "个数",name = "count")
private int count; private int count;
@ApiModelProperty(value = "是否可以删除 0：可以 1：不可以",name = "delete")
private int delete;
} }

2
src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java
View File

@ -108,6 +108,7 @@ public class IndicatorLibraryServiceImpl extends ServiceImpl<IndicatorLibraryMap
StatisticalIndicatorTypeDto dto = new StatisticalIndicatorTypeDto(); StatisticalIndicatorTypeDto dto = new StatisticalIndicatorTypeDto();
dto.setName("未分类指标"); dto.setName("未分类指标");
dto.setIndicatorType(0); dto.setIndicatorType(0);
dto.setDelete(1);
int count = indicatorLibraryMapper.countIndicatorLibrarysByIndicatorType(0); int count = indicatorLibraryMapper.countIndicatorLibrarysByIndicatorType(0);
dto.setCount(count); dto.setCount(count);
if(count>0){ if(count>0){
@ -117,6 +118,7 @@ public class IndicatorLibraryServiceImpl extends ServiceImpl<IndicatorLibraryMap
dto = new StatisticalIndicatorTypeDto(); dto = new StatisticalIndicatorTypeDto();
dto.setName("全部分类"); dto.setName("全部分类");
dto.setIndicatorType(null); dto.setIndicatorType(null);
dto.setDelete(1);
if(CollectionUtils.isNotEmpty(dtos)){ if(CollectionUtils.isNotEmpty(dtos)){
double sum = dtos.stream().mapToDouble(value -> value.getCount()).sum(); double sum = dtos.stream().mapToDouble(value -> value.getCount()).sum();
dto.setCount(Double.valueOf(sum).intValue()); dto.setCount(Double.valueOf(sum).intValue());