|
@@ -17,6 +17,7 @@ import com.jeeplus.sys.domain.Office;
|
|
|
import com.jeeplus.sys.service.OfficeService;
|
|
|
import com.jeeplus.test.jobPosion.domain.JobPosition;
|
|
|
import com.jeeplus.test.jobPosion.domain.Position;
|
|
|
+import com.jeeplus.test.jobPosion.domain.PositionLog;
|
|
|
import com.jeeplus.test.jobPosion.enums.PositionTypeEnum;
|
|
|
import com.jeeplus.test.jobPosion.service.JobPositionService;
|
|
|
import com.jeeplus.test.jobPosion.service.PositionLogService;
|
|
@@ -335,7 +336,7 @@ public class JobPositionController {
|
|
|
@PreAuthorize("hasAnyAuthority('job:job_position:import')")
|
|
|
@PostMapping("import")
|
|
|
@ApiLog(value = "导入职位数据excel", type = LogTypeEnum.IMPORT)
|
|
|
- public ResponseEntity importFile(MultipartFile file) throws IOException{
|
|
|
+ public ResponseEntity importFile(MultipartFile file,HttpServletRequest request) throws IOException{
|
|
|
|
|
|
ArrayList<JobPosition> arrayList = new ArrayList<>();
|
|
|
HashMap<String,String> hashMap = new HashMap<>();
|
|
@@ -358,6 +359,17 @@ public class JobPositionController {
|
|
|
//导入数据
|
|
|
jobPositionService.saveBatch(arrayList);
|
|
|
|
|
|
+ List<PositionLogDTO> positionLogDTOList = new ArrayList<>();
|
|
|
+ arrayList.stream().forEach(item->{
|
|
|
+ PositionLogDTO positionLogDTO = new PositionLogDTO();
|
|
|
+ positionLogDTO.setType(PositionTypeEnum.JOB_POSITION.getValue());
|
|
|
+ positionLogDTO.setOperationType("导入职位");
|
|
|
+ positionLogDTO.setOperationContent("导入职位: "+item.getName());
|
|
|
+ positionLogDTO.setOperationResult("成功");
|
|
|
+ positionLogDTOList.add(positionLogDTO);
|
|
|
+ });
|
|
|
+ positionLogService.saveLogBatch(positionLogDTOList,request);
|
|
|
+
|
|
|
return ResponseEntity.ok("已成功导入 " + arrayList.size() + " 条数据");
|
|
|
}
|
|
|
|