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

fix

Browse Source
This commit is contained in:
杜建超 2020-10-16 15:50:08 +08:00
parent 53812d9e3d
commit 224f5f9f6c
4 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/lz/modules/performance/res/ChartStatistical.java Normal file
View File

@ -0,0 +1,15 @@
package com.lz.modules.performance.res;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "报表统计实体")
public class ChartStatistical {
@ApiModelProperty(value = "描述",name = "desc")
private String desc;
@ApiModelProperty(value = "人数",name = "num")
private int num;
}

9
src/main/java/com/lz/modules/performance/res/ChartStatisticalRes.java
View File

@ -21,12 +21,3 @@ public class ChartStatisticalRes {
}
@Data
@ApiModel(value = "报表统计实体")
class ChartStatistical {
@ApiModelProperty(value = "描述",name = "desc")
private String desc;
@ApiModelProperty(value = "人数",name = "num")
private int num;
}

4
src/main/java/com/lz/modules/performance/service/ChartResultService.java
View File

@ -1,6 +1,8 @@
package com.lz.modules.performance.service;
import com.lz.modules.performance.req.ChartResultReq;
import com.lz.modules.performance.res.ChartStatistical;
import com.lz.modules.performance.res.ChartStatisticalRes;
import java.util.List;
@ -13,6 +15,6 @@ public interface ChartResultService {
void chartReport(ChartResultReq req);
void chartDepartment(List<String>staffIds);
List<ChartStatistical> countDepartmentAndStaffNum(List<String>staffIds);
}

40
src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java
View File

@ -1,15 +1,23 @@
package com.lz.modules.performance.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import com.lz.common.utils.StringUtil;
import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
import com.lz.modules.app.service.DepartmentsStaffRelateService;
import com.lz.modules.performance.req.AssessListReq;
import com.lz.modules.performance.req.ChartResultReq;
import com.lz.modules.performance.res.ChartStatistical;
import com.lz.modules.performance.res.ChartStatisticalRes;
import com.lz.modules.performance.service.ChartResultService;
import com.lz.modules.sys.service.app.ResultRecordService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ArrayUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.*;
/**
* @Author: djc
@ -20,6 +28,8 @@ import java.util.List;
public class ChartResultServiceImpl implements ChartResultService {
@Autowired
private ResultRecordService resultRecordService;
@Autowired
private DepartmentsStaffRelateService departmentsStaffRelateService;
@Override
public void chartReport(ChartResultReq req) {
AssessListReq query = new AssessListReq();
@ -30,7 +40,31 @@ public class ChartResultServiceImpl implements ChartResultService {
}
@Override
public void chartDepartment(List<String> staffIds) {
public List<ChartStatistical> countDepartmentAndStaffNum(List<String> staffIds) {
if(CollectionUtils.isEmpty(staffIds)){
return Collections.EMPTY_LIST;
}
List<ChartStatistical> data = new ArrayList<>();
List<DepartmentsStaffRelateEntity> list = departmentsStaffRelateService.list(new QueryWrapper<DepartmentsStaffRelateEntity>()
.eq("is_delete", 0)
.in("staff_id", staffIds));
Map<String,Integer> map = Maps.newHashMap();
for(DepartmentsStaffRelateEntity entity:list){
String departmentId = entity.getDepartmentId();
Integer count = map.get(departmentId);
if(null != count){
map.put(departmentId,count + 1);
}else {
map.put(departmentId,1);
}
}
for(String s:map.keySet()){
ChartStatistical statistical = new ChartStatistical();
statistical.setDesc(s);
statistical.setNum(map.get(s));
data.add(statistical);
}
return data;
}
}