1.修改岗位上传添加社会信用代码
2.修改es查询时,不放逐添加,修改为精准查询
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.cms.controller.cms;
|
||||
|
||||
import com.alibaba.excel.EasyExcel;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.ruoyi.cms.domain.*;
|
||||
import com.ruoyi.cms.domain.query.ESJobSearch;
|
||||
@@ -7,9 +8,9 @@ import com.ruoyi.cms.domain.vo.CandidateVO;
|
||||
import com.ruoyi.cms.domain.vo.CompanyVo;
|
||||
import com.ruoyi.cms.domain.vo.JobExcelVo;
|
||||
import com.ruoyi.cms.service.*;
|
||||
import com.ruoyi.cms.util.EasyExcelUtils;
|
||||
import com.ruoyi.cms.util.RoleUtils;
|
||||
import com.ruoyi.cms.util.StringUtil;
|
||||
import com.ruoyi.cms.util.excel.JobExcelListener;
|
||||
import com.ruoyi.cms.util.sensitiveWord.SensitiveWordChecker;
|
||||
import com.ruoyi.common.annotation.Anonymous;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
@@ -40,6 +41,7 @@ import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 岗位Controller
|
||||
@@ -390,14 +392,29 @@ public class CmsJobController extends BaseController
|
||||
}
|
||||
|
||||
try (InputStream inputStream = file.getInputStream()){
|
||||
List<JobExcelVo> allExcelVoList = new ArrayList<>();
|
||||
EasyExcelUtils.readExcelByBatch(inputStream, JobExcelVo.class, 100, list -> {
|
||||
allExcelVoList.addAll(list);
|
||||
});
|
||||
if (CollectionUtils.isEmpty(allExcelVoList)) {
|
||||
throw new Exception("Excel文件中无有效数据");
|
||||
JobExcelListener listener = new JobExcelListener();
|
||||
EasyExcel.read(inputStream, JobExcelVo.class, listener).sheet().headRowNumber(1).doRead();
|
||||
|
||||
if (listener.hasColumnError()) {
|
||||
return AjaxResult.error(listener.getColumnErrorMsg());
|
||||
}
|
||||
jobService.uploadFileJob(allExcelVoList);
|
||||
|
||||
List<Integer> emptyRowNumbers = listener.getEmptyRowNumbers();
|
||||
List<JobExcelVo> validDataList = listener.getValidDataList();
|
||||
int emptyCount = emptyRowNumbers.size();
|
||||
|
||||
if (emptyCount > 0) {
|
||||
String rowNumStr = emptyRowNumbers.stream()
|
||||
.map(String::valueOf)
|
||||
.collect(Collectors.joining("、"));
|
||||
return AjaxResult.error(String.format("检测到第%s行社会信用代码为空,本次上传终止,未插入任何数据!", rowNumStr));
|
||||
}
|
||||
|
||||
if (CollectionUtils.isEmpty(validDataList)) {
|
||||
return AjaxResult.error("Excel文件中无有效数据!");
|
||||
}
|
||||
|
||||
jobService.uploadFileJob(validDataList);
|
||||
return AjaxResult.success("已上传!");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
|
||||
Reference in New Issue
Block a user