From c5310438472b4dbb5a4bb7dd76088a693e3972b8 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 11 三月 2021 01:12:22 +0800
Subject: [PATCH] 增加照片查看
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 89 +++++++++++++++++---------------------------
1 files changed, 35 insertions(+), 54 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index 278e5d5..f41de30 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -1,58 +1,39 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.DicItem;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.feign.IRemoteDicItemService;
+import cc.mrbird.febs.server.hr.service.*;
+import cc.mrbird.febs.server.hr.util.PoiExportExcel;
+import cc.mrbird.febs.server.hr.util.PoiImportExcel;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.wuwenze.poi.ExcelKit;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-
-import cc.mrbird.febs.common.core.annotation.FieldInfo;
-import cc.mrbird.febs.common.core.entity.system.SystemUser;
-import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
-import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
-import cc.mrbird.febs.server.hr.entity.EmpJobChange;
-import cn.hutool.core.annotation.AnnotationUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.wuwenze.poi.ExcelKit;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import cc.mrbird.febs.common.core.entity.FebsResponse;
-import cc.mrbird.febs.common.core.entity.QueryRequest;
-import cc.mrbird.febs.common.core.exception.FebsException;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
-import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
-import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
-import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
-import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
-import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
-import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
-import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
-import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
-import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
-import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
-import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
-import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
-import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
-import cc.mrbird.febs.server.hr.service.IEmpResignService;
-import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
-import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
-import cc.mrbird.febs.server.hr.util.PoiExportExcel;
-import cc.mrbird.febs.server.hr.util.PoiImportExcel;
-import cn.hutool.core.date.DateUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
/**
* name:EmpBaseInfo
@@ -85,8 +66,7 @@
private final IEmpLaborTroubleService empLaborTroubleService;
private final IEmpBadRecordService empBadRecordService;
private final IEmpRemarkinfoService empRemarkinfoService;
- private final IRemoteUserService remoteUserService;
- private final IRemoteDeptService remoteDeptService;
+ private final IRemoteDicItemService dicItemService;
@ApiOperation(value = "人员基本信息无翻页列表")
@GetMapping
@@ -226,23 +206,24 @@
InputStream in;
List<List<List<Object>>> listObject;
List<String> returnList = new ArrayList<>();
+ List<DicItem> dicItems = dicItemService.getAllDicitemsAll();
try {
if (!file.isEmpty()) {
in = file.getInputStream();
listObject = PoiImportExcel.getMulitListByExcel(in, file.getOriginalFilename());
in.close();
- empBaseInfoService.importEmpBaseInfo(listObject.get(0),returnList);
+ empBaseInfoService.importEmpBaseInfo(listObject.get(0),returnList,dicItems);
empWorkExperienceService.importEmpWorkExperience(listObject.get(1),returnList);
- empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList);
- empContractInfoService.importEmpContractInfo(listObject.get(3),returnList);
+ empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList,dicItems);
+ empContractInfoService.importEmpContractInfo(listObject.get(3),returnList,dicItems);
empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
empResignService.importEmpResign(listObject.get(6),returnList);
empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
- empInsuranceService.importEmpInsurance(listObject.get(8),returnList);
+ empInsuranceService.importEmpInsurance(listObject.get(8),returnList,dicItems);
empAccidentCasesService.importEmpAccidentCases(listObject.get(9),returnList);
empOccupationalService.importEmpOccupational(listObject.get(10),returnList);
- empLaborTroubleService.importEmpLaborTrouble(listObject.get(11),returnList);
+ empLaborTroubleService.importEmpLaborTrouble(listObject.get(11),returnList,dicItems);
empBadRecordService.importEmpBadRecord(listObject.get(12),returnList);
empRemarkinfoService.importEmpRemarkInfo(listObject.get(13),returnList);
}
--
Gitblit v1.8.0