|
@@ -199,10 +199,10 @@ public class JobCvRelServiceImpl implements JobCvRelService {
|
|
|
@Override
|
|
|
public List<CommonRespVO> getJobCvSexCount(RecruitAnalysisReqVO reqVO) {
|
|
|
LocalDateTime[] timeRange = generateDateTimeRange(reqVO);
|
|
|
- List<CommonRespVO> result = jobCvRelMapper.getJobCvSexCount(reqVO,timeRange[0], timeRange[1]);
|
|
|
+ List<CommonRespVO> result = jobCvRelMapper.getJobCvSexCount(reqVO, timeRange[0], timeRange[1]);
|
|
|
for (PersonSexEnum value : PersonSexEnum.values()) {
|
|
|
CommonRespVO respVO = result.stream()
|
|
|
- .filter(c -> c.getKey().equals(value.getType())).findFirst().orElse(null);
|
|
|
+ .filter(c -> value.getType().equals(c.getKey())).findFirst().orElse(null);
|
|
|
if (null == respVO) {
|
|
|
CommonRespVO newResp = new CommonRespVO();
|
|
|
newResp.setKey(value.getName());
|
|
@@ -212,14 +212,16 @@ public class JobCvRelServiceImpl implements JobCvRelService {
|
|
|
respVO.setKey(value.getName());
|
|
|
}
|
|
|
}
|
|
|
- return result;
|
|
|
+ return result.stream()
|
|
|
+ .filter(c->!PersonSexEnum.UNKNOWN.getName().equals(c.getKey()))
|
|
|
+ .collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object[]> getJobCvAgeCount(RecruitAnalysisReqVO reqVO) {
|
|
|
LocalDateTime[] timeRange = generateDateTimeRange(reqVO);
|
|
|
- List<CommonRespVO> result = jobCvRelMapper.getJobCvAgeCount(reqVO,timeRange[0], timeRange[1]);
|
|
|
+ List<CommonRespVO> result = jobCvRelMapper.getJobCvAgeCount(reqVO, timeRange[0], timeRange[1]);
|
|
|
// 填充
|
|
|
String[] ageArr = new String[]{"18-22岁", "23-30岁", "31-39岁", "40-49岁", "50-59岁", "其他年龄段"};
|
|
|
for (String age : ageArr) {
|
|
@@ -243,11 +245,11 @@ public class JobCvRelServiceImpl implements JobCvRelService {
|
|
|
@Override
|
|
|
public Map<String, Object[]> getJobCvEduCount(RecruitAnalysisReqVO reqVO) {
|
|
|
LocalDateTime[] timeRange = generateDateTimeRange(reqVO);
|
|
|
- List<CommonRespVO> result = jobCvRelMapper.getJobCvEduCount(reqVO,timeRange[0], timeRange[1]);
|
|
|
+ List<CommonRespVO> result = jobCvRelMapper.getJobCvEduCount(reqVO, timeRange[0], timeRange[1]);
|
|
|
// 填充
|
|
|
for (EducationTypeEnum value : EducationTypeEnum.values()) {
|
|
|
CommonRespVO respVO = result.stream()
|
|
|
- .filter(c -> c.getKey().equals(value.getType())).findFirst().orElse(null);
|
|
|
+ .filter(c -> value.getType().equals(c.getKey())).findFirst().orElse(null);
|
|
|
if (null == respVO) {
|
|
|
CommonRespVO newResp = new CommonRespVO();
|
|
|
newResp.setKey(value.getName());
|
|
@@ -269,11 +271,11 @@ public class JobCvRelServiceImpl implements JobCvRelService {
|
|
|
@Override
|
|
|
public Map<String, Object[]> getJobCvExpCount(RecruitAnalysisReqVO reqVO) {
|
|
|
LocalDateTime[] timeRange = generateDateTimeRange(reqVO);
|
|
|
- List<CommonRespVO> result = jobCvRelMapper.getJobCvExpCount(reqVO,timeRange[0], timeRange[1]);
|
|
|
+ List<CommonRespVO> result = jobCvRelMapper.getJobCvExpCount(reqVO, timeRange[0], timeRange[1]);
|
|
|
// 填充
|
|
|
for (ExpTypeEnum value : ExpTypeEnum.values()) {
|
|
|
CommonRespVO respVO = result.stream()
|
|
|
- .filter(c -> c.getKey().equals(value.getType())).findFirst().orElse(null);
|
|
|
+ .filter(c -> value.getType().equals(c.getKey())).findFirst().orElse(null);
|
|
|
if (null == respVO) {
|
|
|
CommonRespVO newResp = new CommonRespVO();
|
|
|
newResp.setKey(value.getName());
|
|
@@ -295,13 +297,13 @@ public class JobCvRelServiceImpl implements JobCvRelService {
|
|
|
@Override
|
|
|
public PageResult<RecruitJobCvRelAnalysisRespVO> getNewCvRel(RecruitAnalysisReqVO reqVO) {
|
|
|
LocalDateTime[] timeRange = generateDateTimeRange(reqVO);
|
|
|
- return jobCvRelMapper.getAnalysisDetail(reqVO,timeRange[0], timeRange[1],JobCvRelStatusEnum.NEW.getStatus());
|
|
|
+ return jobCvRelMapper.getAnalysisDetail(reqVO, timeRange[0], timeRange[1], JobCvRelStatusEnum.NEW.getStatus());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public PageResult<RecruitJobCvRelAnalysisRespVO> getLookCvRel(RecruitAnalysisReqVO reqVO) {
|
|
|
LocalDateTime[] timeRange = generateDateTimeRange(reqVO);
|
|
|
- return jobCvRelMapper.getAnalysisDetail(reqVO,timeRange[0], timeRange[1],JobCvRelStatusEnum.LOOK.getStatus());
|
|
|
+ return jobCvRelMapper.getAnalysisDetail(reqVO, timeRange[0], timeRange[1], JobCvRelStatusEnum.LOOK.getStatus());
|
|
|
}
|
|
|
|
|
|
|