From ac7c05644ab8e5cf3ea4d00e6ecfd75a746af88a Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期日, 21 二月 2021 10:27:12 +0800
Subject: [PATCH] 提交员工智叟的所有导出
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java | 20 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java | 13 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 17 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/annotation/ControllerEndpoint.java | 18 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java | 15 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java | 17 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 38 ++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java | 13 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 29 +--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 42 ++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 18 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 16 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 18 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java | 30 +++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java | 13 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java | 13 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java | 15 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java | 14 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java | 12 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 10 +
33 files changed, 518 insertions(+), 19 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/annotation/ControllerEndpoint.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/annotation/ControllerEndpoint.java
new file mode 100644
index 0000000..a88055f
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/annotation/ControllerEndpoint.java
@@ -0,0 +1,18 @@
+package cc.mrbird.febs.server.hr.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author MrBird
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ControllerEndpoint {
+
+ String operation() default "";
+
+ String exceptionMessage() default "FEBS系统内部异常";
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
index b935cdd..95a940c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,11 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.io.IOException;
+import java.util.List;
import java.util.Map;
/**
@@ -50,7 +56,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empAccidentCasesService.findEmpAccidentcasess(request, empAccidentcases));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpAccidentCases empBaseinfo, HttpServletResponse response) {
+ List<EmpAccidentCases> records = this.empAccidentCasesService.findEmpAccidentcasess(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpAccidentCases.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empAccidentcases:add')")
public void addEmpAccidentCases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
index 305fff2..9718cd7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
@@ -1,11 +1,15 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
+import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +18,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -50,7 +56,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBadrecordService.findEmpBadrecords(request, empBadrecord));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpBadRecord empBaseinfo, HttpServletResponse response) {
+ List<EmpBadRecord> records = this.empBadrecordService.findEmpBadrecords(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpBadRecord.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empBadrecord:add')")
public void addEmpBadrecord(@Valid EmpBadRecord empBadrecord) throws FebsException {
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 9e3c206..664726b 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
@@ -11,15 +11,13 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import cc.mrbird.febs.common.core.entity.system.SystemUser;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import com.wuwenze.poi.ExcelKit;
+
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import cc.mrbird.febs.common.core.entity.FebsResponse;
@@ -153,17 +151,12 @@
}
@ApiOperation(value = "导出员工")
- @PostMapping("export")
- public void export(QueryRequest request, HttpServletResponse response, String exportField) throws IOException {
- EmpBaseInfo empBaseinfo = new EmpBaseInfo();
- empBaseinfo.setDelFlag(0);
- List<EmpBaseInfo> exportList = empBaseInfoService.findEmpBaseInfos(empBaseinfo);
- List<Map<String, Object>> listMapDicItem = new ArrayList();
- List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, listMapDicItem);
- String fileName = "在职员工列表";
- Date currentDate = new Date();
- String dateStr = DateUtil.formatDate(currentDate);
- boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpBaseInfo empBaseinfo, HttpServletResponse response) throws IOException {
+
+ List<EmpBaseInfo> records = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpBaseInfo.class, response).downXlsx(records, false);
}
@ApiOperation(value = "导入员工")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
index 4626a43..34075cc 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -50,7 +55,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findEmpContractinfos(request, empContractinfo));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpContractInfo empBaseinfo, HttpServletResponse response) {
+ List<EmpContractInfo> records = this.empContractinfoService.findEmpContractinfos(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpContractInfo.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empContractinfo:add')")
public void addEmpContractinfo(@Valid EmpContractInfo empContractinfo) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
index bbee976..73375c7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -50,7 +55,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionattendService.findEmpDimissionattends(request, empDimissionattend));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpDimissionAttend empBaseinfo, HttpServletResponse response) {
+ List<EmpDimissionAttend> records = this.empDimissionattendService.findEmpDimissionattends(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpDimissionAttend.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empDimissionattend:add')")
public void addEmpDimissionattend(@Valid EmpDimissionAttend empDimissionattend) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java
index bd2e8c9..bba6497 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionLogController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,7 +17,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.util.List;
import java.util.Map;
/**
@@ -51,7 +56,14 @@
<String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionlogService.findEmpDimissionLogs(request, empDimissionlog));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpDimissionLog empBaseinfo, HttpServletResponse response) {
+ List<EmpDimissionLog> records = this.empDimissionlogService.findEmpDimissionLogs(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpDimissionLog.class, response).downXlsx(records, false);
+ }
@ApiOperation(value = "员工离职记录增加")
@PostMapping
@PreAuthorize("hasAuthority('empDimissionlog:add')")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
index d1f7de8..ecd4add 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -50,7 +55,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empInsuranceService.findEmpInsurances(request, empInsurance));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpInsurance empBaseinfo, HttpServletResponse response) {
+ List<EmpInsurance> records = this.empInsuranceService.findEmpInsurances(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpInsurance.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empInsurance:add')")
public void addEmpInsurance(@Valid EmpInsurance empInsurance) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
index 71abac3..a2f1895 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpJobChangeController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,7 +17,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.util.List;
import java.util.Map;
/**
@@ -51,7 +56,14 @@
<String, Object> dataTable = FebsUtil.getDataTable(this.empJobchangeService.findEmpJobChanges(request, empJobchange));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpJobChange empBaseinfo, HttpServletResponse response) {
+ List<EmpJobChange> records = this.empJobchangeService.findEmpJobChanges(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpJobChange.class, response).downXlsx(records, false);
+ }
@ApiOperation(value = "员工调岗记录增加")
@PostMapping
@PreAuthorize("hasAuthority('empJobchange:add')")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
index c0610c2..8f90516 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -50,7 +55,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLabortroubleService.findEmpLabortroubles(request, empLabortrouble));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpLaborTrouble empBaseinfo, HttpServletResponse response) {
+ List<EmpLaborTrouble> records = this.empLabortroubleService.findEmpLabortroubles(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpLaborTrouble.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empLabortrouble:add')")
public void addEmpLabortrouble(@Valid EmpLaborTrouble empLabortrouble) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
index 49faf24..b2a9e35 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -50,7 +55,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLeaveinfoService.findEmpLeaveInfos(request, empLeaveinfo));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpLeaveInfo empBaseinfo, HttpServletResponse response) {
+ List<EmpLeaveInfo> records = this.empLeaveinfoService.findEmpLeaveInfos(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpLeaveInfo.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empLeaveinfo:add')")
public void addEmpLeaveinfo(@Valid EmpLeaveInfo empLeaveinfo) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
index 5cd2e54..87bd791 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -49,7 +54,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empOccupationalService.findEmpOccupationals(request, empOccupational));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpOccupational empBaseinfo, HttpServletResponse response) {
+ List<EmpOccupational> records = this.empOccupationalService.findEmpOccupationals(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpOccupational.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empOccupational:add')")
public void addEmpOccupational(@Valid EmpOccupational empOccupational) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
index f262cbb..368b6e1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.service.IEmpPhysicalExamService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -49,7 +54,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empPhysicalExamService.findEmpPhysicalExams(request, empPhysicalexam));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpPhysicalExam empBaseinfo, HttpServletResponse response) {
+ List<EmpPhysicalExam> records = this.empPhysicalExamService.findEmpPhysicalExams(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpPhysicalExam.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empPhysicalexam:add')")
public void addEmpPhysicalExam(@Valid EmpPhysicalExam empPhysicalexam) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
index 9bfdc73..f1480bb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpPhysicalExam;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -49,7 +54,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empRemarkinfoService.findEmpRemarkinfos(request, empRemarkinfo));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpRemarkInfo empBaseinfo, HttpServletResponse response) {
+ List<EmpRemarkInfo> records = this.empRemarkinfoService.findEmpRemarkinfos(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpRemarkInfo.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empRemarkinfo:add')")
public void addEmpRemarkinfo(@Valid EmpRemarkInfo empRemarkinfo) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
index 318fa65..9e45270 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -49,7 +54,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empResignService.findEmpResigns(request, empResign));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpResign empBaseinfo, HttpServletResponse response) {
+ List<EmpResign> records = this.empResignService.findEmpResigns(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpResign.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empResign:add')")
public void addEmpResign(@Valid EmpResign empResign) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
index 12cc8b5..353e44b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.service.IEmpUnemploymentService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -49,7 +54,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empUnemploymentService.findEmpUnemployments(request, empUnemployment));
return new FebsResponse().data(dataTable);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpUnemployment empBaseinfo, HttpServletResponse response) {
+ List<EmpUnemployment> records = this.empUnemploymentService.findEmpUnemployments(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpUnemployment.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empUnemployment:add')")
public void addEmpUnemployment(@Valid EmpUnemployment empUnemployment) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
index 5daa8d3..4a92684 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.entity.EmpWorkExperience;
import cc.mrbird.febs.server.hr.service.IEmpWorkExperienceService;
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 com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -14,8 +17,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -49,7 +54,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empWorkExperienceService.findEmpWorkExperiences(request, empWorkexperience));
return new FebsResponse().data(dataTable);
}
-
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, EmpWorkExperience empBaseinfo, HttpServletResponse response) {
+ empBaseinfo.setDelFlag(0);
+ List<EmpWorkExperience> records = this.empWorkExperienceService.findEmpWorkExperiences(request, empBaseinfo).getRecords();
+ ExcelKit.$Export(EmpWorkExperience.class, response).downXlsx(records, false);
+ }
@PostMapping
@PreAuthorize("hasAuthority('empWorkexperience:add')")
public void addEmpWorkExperience(@Valid EmpWorkExperience empWorkexperience) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
index 10ed076..71f45ae 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
@@ -4,6 +4,7 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
@@ -13,6 +14,8 @@
import java.math.BigDecimal;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +34,7 @@
*/
@Data
@TableName("t_emp_accidentcases")
+@Excel("员工意外险案件")
public class EmpAccidentCases implements Serializable {
private static final long serialVersionUID = 3423747469056866015L;
@@ -44,22 +48,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -68,6 +77,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -76,6 +86,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "injuredTime", type = "datetime", explain = "受伤时间")
@@ -83,38 +94,47 @@
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(value = "受伤时间", writeConverter = TimeConverter.class)
private Date injuredTime;
@FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
@TableField("injuredAddress")
+ @ExcelField(value = "受伤地点")
private String injuredAddress = "";
@FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
@TableField("injuredPart")
+ @ExcelField(value = "受伤部位")
private String injuredPart = "";
@FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "意外险诊断")
@TableField("injuredDiacrisis")
+ @ExcelField(value = "意外险诊断")
private String injuredDiacrisis = "";
@FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
@TableField("injuredDescribe")
+ @ExcelField(value = "受伤经过描述")
private String injuredDescribe = "";
@FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
@TableField("hospitalName")
+ @ExcelField(value = "就诊医院")
private String hospitalName = "";
@FieldInfo(name = "treatmentName", type = "varchar", explain = "就诊科室")
@TableField("treatmentName")
+ @ExcelField(value = "就诊科室")
private String treatmentName = "";
@FieldInfo(name = "hospitalizatioFlag", type = "bit", explain = "是否住院")
@TableField("hospitalizatioFlag")
+ @ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
private Integer hospitalizatioFlag = 0;
@FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
@TableField("bedNumb")
+ @ExcelField(value = "床号")
private Integer bedNumb = 0;
@FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
@@ -122,6 +142,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "报案时间", writeConverter = TimeConverter.class)
private Date reprotTime;
@FieldInfo(name = "submitTime", type = "datetime", explain = "资料提交日期")
@@ -129,22 +150,27 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "资料提交日期", writeConverter = TimeConverter.class)
private Date submitTime;
@FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
@TableField("sbumitBy")
+ @ExcelField(value = "递交人")
private String sbumitBy = "";
@FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
@TableField("expensesFee")
+ @ExcelField(value = "医疗总费用")
private BigDecimal expensesFee = BigDecimal.ZERO;
@FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
@TableField("expenseReport")
+ @ExcelField(value = "报单号")
private String expenseReport = "";
@FieldInfo(name = "innsureFee", type = "decimal", explain = "保险赔付费用")
@TableField("innsureFee")
+ @ExcelField(value = "保险赔付费用")
private BigDecimal innsureFee = BigDecimal.ZERO;
@FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
@@ -152,6 +178,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "人事处理时间", writeConverter = TimeConverter.class)
private Date hrDoDate;
@FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
@@ -159,14 +186,17 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
private Date settleDate;
@FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
@TableField("settleStatus")
+ @ExcelField(value = "结案状态", writeConverterExp = "0=未结案,1=已结案")
private Integer settleStatus = 0;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
+ @ExcelField(value = "备注")
private String remark = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
index c4885d8..00630ae 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_badrecord")
+@Excel("员工不良记录")
public class EmpBadRecord implements Serializable {
private static final long serialVersionUID = 3681849796837950530L;
@@ -41,18 +45,22 @@
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -61,6 +69,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -69,6 +78,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "badDate", type = "date", explain = "不良记录日期")
@@ -76,14 +86,17 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "不良记录日期", writeConverter = TimeConverter.class)
private Date badDate;
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
+ @ExcelField(value = "报备人")
private String reporter = "";
@FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
@TableField("badContent")
+ @ExcelField(value = "不良记录描述")
private String badContent = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index 11f46aa..aaebe7a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -30,6 +33,7 @@
*/
@Data
@TableName("t_emp_baseInfo")
+@Excel("员工基本信息表")
public class EmpBaseInfo implements Serializable {
@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@@ -42,6 +46,7 @@
@FieldInfo(name = "archivesNumb", type = "varchar", explain = "档案号")
@TableField("archivesNumb")
+ @ExcelField(value = "档案号")
private String archivesNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -50,21 +55,25 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "护卫点(部门)")
private String deptName = "";
@NotBlank(message = "{required}")
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@NotBlank(message = "{required}")
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@NotBlank(message = "{required}")
@FieldInfo(name = "sex", type = "varchar", explain = "性别")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "sexName", type = "varchar", explain = "性别")
@@ -77,11 +86,13 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@NotBlank(message = "{required}")
@FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类别字典表")
@TableField("empType")
+ @ExcelField(value = "员工类别", writeConverterExp = "1=正式工,2=临时工")
private String empType = "";
@FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别,员工类别字典表")
@@ -94,6 +105,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "nation", type = "varchar", explain = "民族")
@@ -102,6 +114,7 @@
@FieldInfo(name = "nationName", type = "varchar", explain = "民族")
@TableField(exist = false)
+ @ExcelField(value = "民族")
private String nationName = "";
@FieldInfo(name = "certificateValidity", type = "date", explain = "证件有效期")
@@ -109,6 +122,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "证件有效期", writeConverter = TimeConverter.class)
private Date certificateValidity;
@FieldInfo(name = "marriage", type = "varchar", explain = "婚姻状况")
@@ -117,14 +131,17 @@
@FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
@TableField(exist = false)
+ @ExcelField(value = "婚姻状况")
private String marriageName = "";
@FieldInfo(name = "age", type = "tinyint", explain = "年龄")
@TableField("age")
+ @ExcelField(value = "年龄")
private Integer age = 0;
@FieldInfo(name = "stature", type = "smallint", explain = "身高")
@TableField("stature")
+ @ExcelField(value = "身高")
private Integer stature = 0;
@FieldInfo(name = "birthdate", type = "date", explain = "出生日期")
@@ -132,6 +149,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "出生日期", writeConverter = TimeConverter.class)
private Date birthdate;
@FieldInfo(name = "politics", type = "varchar", explain = "政治面貌")
@@ -140,6 +158,7 @@
@FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
@TableField(exist = false)
+ @ExcelField(value = "政治面貌")
private String politicsName = "";
@FieldInfo(name = "entryDate", type = "date", explain = "入职日期")
@@ -147,6 +166,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "入职日期", writeConverter = TimeConverter.class)
private Date entryDate;
@FieldInfo(name = "dimissionDate", type = "date", explain = "离职日期")
@@ -154,6 +174,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "离职日期", writeConverter = TimeConverter.class)
private Date dimissionDate;
@FieldInfo(name = "education", type = "varchar", explain = "最高学历")
@@ -162,10 +183,12 @@
@FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
@TableField(exist = false)
+ @ExcelField(value = "最高学历")
private String educationName = "";
@FieldInfo(name = "seniority", type = "tinyint", explain = "入司工龄")
@TableField("seniority")
+ @ExcelField(value = "入司工龄")
private Integer seniority = 0;
@FieldInfo(name = "nativePlace", type = "varchar", explain = "籍贯")
@@ -174,30 +197,37 @@
@FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
@TableField(exist = false)
+ @ExcelField(value = "籍贯")
private String nativePlaceName = "";
@FieldInfo(name = "censusAddress", type = "varchar", explain = "户籍地址")
@TableField("censusAddress")
+ @ExcelField(value = "户籍地址")
private String censusAddress = "";
@FieldInfo(name = "currentAddress", type = "varchar", explain = "现住址")
@TableField("currentAddress")
+ @ExcelField(value = "现住址")
private String currentAddress = "";
@FieldInfo(name = "guardNumb", type = "varchar", explain = "保安员证号")
@TableField("guardNumb")
+ @ExcelField(value = "保安员证号")
private String guardNumb = "";
@FieldInfo(name = "telePhone", type = "varchar", explain = "电话号码")
@TableField("telePhone")
+ @ExcelField(value = "电话号码")
private String telePhone = "";
@FieldInfo(name = "returnReceipt", type = "varchar", explain = "保安员回执")
@TableField("returnReceipt")
+ @ExcelField(value = "保安员回执")
private String returnReceipt = "";
@FieldInfo(name = "introducer", type = "varchar", explain = "招聘介绍人")
@TableField("introducer")
+ @ExcelField(value = "招聘介绍人")
private String introducer = "";
@FieldInfo(name = "archivesStatus", type = "varchar", explain = "档案情况")
@@ -206,14 +236,17 @@
@FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
@TableField(exist = false)
+ @ExcelField(value = "档案情况")
private String archivesStatusName = "";
@FieldInfo(name = "bankName", type = "varchar", explain = "银行名称")
@TableField("bankName")
+ @ExcelField(value = "银行名称")
private String bankName = "";
@FieldInfo(name = "bankNumb", type = "varchar", explain = "银行账号")
@TableField("bankNumb")
+ @ExcelField(value = "银行账号")
private String bankNumb = "";
@FieldInfo(name = "InsuranceType", type = "varchar", explain = "保险类型")
@@ -222,26 +255,32 @@
@FieldInfo(name = "InsuranceTypeName", type = "varchar", explain = "保险类型")
@TableField(exist = false)
+ @ExcelField(value = "保险类型")
private String insuranceTypeName = "";
@FieldInfo(name = "socialNumb", type = "varchar", explain = "社保电脑号")
@TableField("socialNumb")
+ @ExcelField(value = "社保电脑号")
private String socialNumb = "";
@FieldInfo(name = "family", type = "varchar", explain = "家庭成员及关系")
@TableField("family")
+ @ExcelField(value = "家庭成员及关系")
private String family = "";
@FieldInfo(name = "handbookStatus", type = "varchar", explain = "员工手册")
@TableField("handbookStatus")
+ @ExcelField(value = "员工手册")
private String handbookStatus = "";
@FieldInfo(name = "urgencyPhone", type = "varchar", explain = "紧急联系电话")
@TableField("urgencyPhone")
+ @ExcelField(value = "紧急联系电话")
private String urgencyPhone = "";
@FieldInfo(name = "empCardStatus", type = "varchar", explain = "工作证")
@TableField("empCardStatus")
+ @ExcelField(value = "工作证")
private String empCardStatus = "";
@FieldInfo(name = "certificateList", type = "varchar", explain = "相关证件")
@@ -250,16 +289,19 @@
@FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
@TableField(exist = false)
+ @ExcelField(value = "相关证件")
private String certificateListName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
@TableField("dimissionType")
+ @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
private String dimissionType;
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index f546123..2f5927c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_contractinfo")
+@Excel("员工合同信息")
public class EmpContractInfo implements Serializable {
private static final long serialVersionUID = 4152214737054224645L;
@@ -41,22 +45,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -65,6 +74,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -73,6 +83,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
@@ -80,6 +91,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "开始日期", writeConverter = TimeConverter.class)
private Date beginDate;
@FieldInfo(name = "endDate", type = "date", explain = "结束日期")
@@ -87,18 +99,22 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "结束日期", writeConverter = TimeConverter.class)
private Date endDate;
@FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
@TableField("contractStatus")
+ @ExcelField(value = "合同状态", writeConverterExp = "1=有效,2=到期,3=续签,4=存档")
private String contractStatus = "";
@FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
@TableField("contractPeriod")
+ @ExcelField(value = "合同期限(年)")
private Integer contractPeriod = 0;
@FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
@TableField("transactor")
+ @ExcelField(value = "合同办理人")
private String transactor = "";
@FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
@@ -106,10 +122,12 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "合同签订日期", writeConverter = TimeConverter.class)
private Date signingDate;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
+ @ExcelField(value = "备注")
private String remark = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
index c99e9d9..307da65 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
@@ -13,6 +13,8 @@
import java.math.BigDecimal;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +33,7 @@
*/
@Data
@TableName("t_emp_dimissionattend")
+@Excel("离职当月考勤")
public class EmpDimissionAttend implements Serializable {
private static final long serialVersionUID = 6080263775807562989L;
@@ -44,22 +47,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -68,6 +76,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -76,38 +85,47 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
@TableField(exist = false)
+ @ExcelField(value = "考勤年份")
private String attendYear = "";
@FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤月份")
@TableField("attendMonth")
+ @ExcelField(value = "考勤月份")
private String attendMonth = "";
@FieldInfo(name = "attendDays", type = "decimal", explain = "出勤天数")
@TableField("attendDays")
+ @ExcelField(value = "出勤天数")
private BigDecimal attendDays = BigDecimal.ZERO;
@FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
@TableField("overtimeHour")
+ @ExcelField(value = "加班小时")
private BigDecimal overtimeHour = BigDecimal.ZERO;
@FieldInfo(name = "overtimeDay", type = "decimal", explain = "加班（天）")
@TableField("overtimeDay")
+ @ExcelField(value = "加班（天）")
private BigDecimal overtimeDay = BigDecimal.ZERO;
@FieldInfo(name = "leaveDay", type = "decimal", explain = "请假（天）")
@TableField("leaveDay")
+ @ExcelField(value = "请假（天）")
private BigDecimal leaveDay = BigDecimal.ZERO;
@FieldInfo(name = "deduct", type = "decimal", explain = "有无代扣款项")
@TableField("deduct")
+ @ExcelField(value = "有无代扣款项")
private BigDecimal deduct = BigDecimal.ZERO;
@FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
@TableField("absenteeism")
+ @ExcelField(value = "旷工（天）")
private BigDecimal absenteeism = BigDecimal.ZERO;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index f47e94c..3e9166b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
@@ -4,6 +4,7 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
@@ -13,6 +14,8 @@
import java.math.BigDecimal;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +34,7 @@
*/
@Data
@TableName("t_emp_dimissionlog")
+@Excel("员工离职记录")
public class EmpDimissionLog implements Serializable {
@FieldInfo(name = "closeId", type = "bigint", explain = "档案关闭Id")
@@ -46,6 +50,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "入职日期", writeConverter = TimeConverter.class)
private Date entryDate;
@FieldInfo(name = "dimissionDate", type = "date", explain = "离职日期")
@@ -53,22 +58,27 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "离职日期", writeConverter = TimeConverter.class)
private Date dimissionDate;
@FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
@TableField("dimissionType")
+ @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
private String dimissionType = "1";
@FieldInfo(name = "selfLeaveDay", type = "decimal", explain = "自离天数")
@TableField("selfLeaveDay")
+ @ExcelField(value = "自离天数")
private BigDecimal selfLeaveDay = BigDecimal.ZERO;
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
+ @ExcelField(value = "报备人")
private String reporter = "";
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
+ @ExcelField(value = "备注")
private String remark = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index 79ad45e..bd0836a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_insurance")
+@Excel("员工社保申请")
public class EmpInsurance implements Serializable {
private static final long serialVersionUID = 208703298339870887L;
@@ -41,22 +45,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -65,6 +74,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -73,6 +83,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
@@ -80,26 +91,32 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
private Date applayDate;
@FieldInfo(name = "proposer", type = "varchar", explain = "申请人")
@TableField("proposer")
+ @ExcelField(value = "申请人")
private String proposer = "";
@FieldInfo(name = "insuranceGaers", type = "varchar", explain = "社保档位")
@TableField("insuranceGaers")
+ @ExcelField(value = "社保档位")
private String insuranceGaers = "";
@FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告 0-未报告 1-已报告")
@TableField("reportStatus")
+ @ExcelField(value = "是否已报告", writeConverterExp = "0=未报告,1=已报告")
private Integer reportStatus = 0;
@FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 0-未申请 1-已申请")
@TableField("applayStatus")
+ @ExcelField(value = "申请状态", writeConverterExp = "0=未申请,1=已申请")
private Integer applayStatus = 0;
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@TableField("auditor")
+ @ExcelField(value = "审核人")
private String auditor = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
index 092d4fa..1c0285c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_jobchange")
+@Excel("员工调岗记录")
public class EmpJobChange implements Serializable {
private static final long serialVersionUID = 4229887878987429956L;
@@ -41,26 +45,32 @@
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "oldDeptName", type = "varchar", explain = "原部门")
@TableField("oldDeptName")
+ @ExcelField(value = "原部门")
private String oldDeptName = "";
@FieldInfo(name = "oldJobName", type = "varchar", explain = "原岗位")
@TableField("oldJobName")
+ @ExcelField(value = "原岗位")
private String oldJobName = "";
@FieldInfo(name = "newDeptName", type = "varchar", explain = "新部门")
@TableField("newDeptName")
+ @ExcelField(value = "新部门")
private String newDeptName = "";
@FieldInfo(name = "newJobName", type = "varchar", explain = "新岗位")
@TableField("newJobName")
+ @ExcelField(value = "新岗位")
private String newJobName = "";
@FieldInfo(name = "changeType", type = "varchar", explain = "调岗类型")
@TableField("changeType")
+ @ExcelField(value = "调岗类型",writeConverterExp = "2=升职,3=调动")
private String changeType = "";
@FieldInfo(name = "changeDate", type = "date", explain = "调岗位日期")
@@ -68,10 +78,12 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "调岗位日期", writeConverter = TimeConverter.class)
private Date changeDate;
@FieldInfo(name = "changeReason", type = "varchar", explain = "调岗原因")
@TableField("changeReason")
+ @ExcelField(value = "调岗原因")
private String changeReason = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
index 5f59318..5673a0e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
@@ -4,6 +4,7 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
@@ -13,6 +14,8 @@
import java.math.BigDecimal;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +34,7 @@
*/
@Data
@TableName("t_emp_labortrouble")
+@Excel("员工劳资案件")
public class EmpLaborTrouble implements Serializable {
private static final long serialVersionUID = -7587978188799851715L;
@@ -44,14 +48,17 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@@ -60,6 +67,7 @@
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -68,6 +76,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -76,6 +85,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "arbitrationDate", type = "date", explain = "仲裁日期")
@@ -83,22 +93,27 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "仲裁日期", writeConverter = TimeConverter.class)
private Date arbitrationDate;
@FieldInfo(name = "arbitrationType", type = "varchar", explain = "仲裁类型")
@TableField("arbitrationType")
+ @ExcelField(value = "仲裁类型", writeConverterExp = "01=未报告,02=民事纠纷,03=合同纠纷")
private String arbitrationType = "";
@FieldInfo(name = "arbitrationReason", type = "varchar", explain = "仲裁事由")
@TableField("arbitrationReason")
+ @ExcelField(value = "仲裁事由")
private String arbitrationReason = "";
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
+ @ExcelField(value = "报备人")
private String reporter = "";
@FieldInfo(name = "arbitrationPay", type = "decimal", explain = "仲裁赔付（元）")
@TableField("arbitrationPay")
+ @ExcelField(value = "仲裁赔付（元）")
private BigDecimal arbitrationPay = BigDecimal.ZERO;
@FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
@@ -110,6 +125,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
private Date settleDate;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
index 5f3336c..9e15844 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
@@ -4,6 +4,7 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
@@ -13,6 +14,8 @@
import java.math.BigDecimal;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +34,7 @@
*/
@Data
@TableName("t_emp_leaveinfo")
+@Excel("员工请假记录")
public class EmpLeaveInfo implements Serializable {
private static final long serialVersionUID = -906183894054123470L;
@@ -44,22 +48,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -68,6 +77,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -76,6 +86,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "beginTime", type = "datetime", explain = "开始时间")
@@ -83,6 +94,7 @@
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(value = "开始时间", writeConverter = TimeConverter.class)
private Date beginTime;
@FieldInfo(name = "endTime", type = "datetime", explain = "结束时间")
@@ -90,18 +102,22 @@
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(value = "结束时间", writeConverter = TimeConverter.class)
private Date endTime;
@FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
@TableField("leaveType")
+ @ExcelField(value = "请假类型", writeConverterExp = "1=事假,2=病假")
private String leaveType = "";
@FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
@TableField("leaveDay")
+ @ExcelField(value = "请假天数")
private BigDecimal leaveDay = BigDecimal.ZERO;
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
+ @ExcelField(value = "报备人")
private String reporter = "";
@FieldInfo(name = "returnDate", type = "date", explain = "到岗时间")
@@ -109,6 +125,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "到岗时间", writeConverter = TimeConverter.class)
private Date returnDate;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
index d9bbbd6..e54d053 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
@@ -4,6 +4,7 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
@@ -13,6 +14,8 @@
import java.math.BigDecimal;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -31,6 +34,7 @@
*/
@Data
@TableName("t_emp_occupational")
+@Excel("员工工伤案件")
public class EmpOccupational implements Serializable {
private static final long serialVersionUID = 5704201515491620531L;
@@ -44,22 +48,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -68,6 +77,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -76,6 +86,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "injuredTime", type = "datetime", explain = "受伤时间")
@@ -83,38 +94,47 @@
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(value = "受伤时间", writeConverter = TimeConverter.class)
private Date injuredTime;
@FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
@TableField("injuredAddress")
+ @ExcelField(value = "受伤地点")
private String injuredAddress = "";
@FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
@TableField("injuredPart")
+ @ExcelField(value = "受伤部位")
private String injuredPart = "";
@FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "受伤诊断")
@TableField("injuredDiacrisis")
+ @ExcelField(value = "受伤诊断")
private String injuredDiacrisis = "";
@FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
@TableField("injuredDescribe")
+ @ExcelField(value = "受伤经过描述")
private String injuredDescribe = "";
@FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
@TableField("hospitalName")
+ @ExcelField(value = "就诊医院")
private String hospitalName = "";
@FieldInfo(name = "treatmentName", type = "varchar", explain = "就诊科室")
@TableField("treatmentName")
+ @ExcelField(value = "就诊科室")
private String treatmentName = "";
@FieldInfo(name = "hospitalizatioFlag", type = "bit", explain = "是否住院")
@TableField("hospitalizatioFlag")
+ @ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
private Integer hospitalizatioFlag = 0;
@FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
@TableField("bedNumb")
+ @ExcelField(value = "床号")
private Integer bedNumb = 0;
@FieldInfo(name = "reportTime", type = "datetime", explain = "报案时间")
@@ -122,6 +142,7 @@
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelField(value = "报案时间", writeConverter = TimeConverter.class)
private Date reportTime;
@FieldInfo(name = "submitTime", type = "datetime", explain = "资料递交日期")
@@ -129,10 +150,12 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "资料递交日期", writeConverter = TimeConverter.class)
private Date submitTime;
@FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
@TableField("sbumitBy")
+ @ExcelField(value = "递交人")
private String sbumitBy = "";
@FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
@@ -140,62 +163,77 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "人事处理时间", writeConverter = TimeConverter.class)
private Date hrDoDate;
@FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
@TableField("expensesFee")
+ @ExcelField(value = "医疗总费用")
private BigDecimal expensesFee = BigDecimal.ZERO;
@FieldInfo(name = "eliminate", type = "decimal", explain = "剔除总额")
@TableField("eliminate")
+ @ExcelField(value = "剔除总额")
private BigDecimal eliminate = BigDecimal.ZERO;
@FieldInfo(name = "socialDisability", type = "decimal", explain = "一次性伤残补助金")
@TableField("socialDisability")
+ @ExcelField(value = "一次性伤残补助金")
private BigDecimal socialDisability = BigDecimal.ZERO;
@FieldInfo(name = "socialAllowance", type = "decimal", explain = "住院伙食补贴")
@TableField("socialAllowance")
+ @ExcelField(value = "住院伙食补贴")
private BigDecimal socialAllowance = BigDecimal.ZERO;
@FieldInfo(name = "socialSubsidy", type = "decimal", explain = "一次性医疗补助金")
@TableField("socialSubsidy")
+ @ExcelField(value = "一次性医疗补助金")
private BigDecimal socialSubsidy = BigDecimal.ZERO;
@FieldInfo(name = "socialCompensation", type = "decimal", explain = "社保赔偿总费用")
@TableField("socialCompensation")
+ @ExcelField(value = "社保赔偿总费用")
private BigDecimal socialCompensation = BigDecimal.ZERO;
@FieldInfo(name = "compensated", type = "decimal", explain = "已赔付医药费用")
@TableField("compensated")
+ @ExcelField(value = "已赔付医药费用")
private BigDecimal compensated = BigDecimal.ZERO;
@FieldInfo(name = "otherCompensated", type = "decimal", explain = "其他赔偿报销")
@TableField("otherCompensated")
+ @ExcelField(value = "其他赔偿报销")
private BigDecimal otherCompensated = BigDecimal.ZERO;
@FieldInfo(name = "companylDisability", type = "decimal", explain = "公司一次性伤残补助金")
@TableField("companylDisability")
+ @ExcelField(value = "公司一次性伤残补助金")
private BigDecimal companylDisability = BigDecimal.ZERO;
@FieldInfo(name = "companyAllowance", type = "decimal", explain = "工伤生活补贴")
@TableField("companyAllowance")
+ @ExcelField(value = "工伤生活补贴")
private BigDecimal companyAllowance = BigDecimal.ZERO;
@FieldInfo(name = "companySubsidy", type = "decimal", explain = "公司一次性医疗补助金")
@TableField("companySubsidy")
+ @ExcelField(value = "公司一次性医疗补助金")
private BigDecimal companySubsidy = BigDecimal.ZERO;
@FieldInfo(name = "companyCompensation", type = "decimal", explain = "公司赔偿总费用")
@TableField("companyCompensation")
+ @ExcelField(value = "公司赔偿总费用")
private BigDecimal companyCompensation = BigDecimal.ZERO;
@FieldInfo(name = "jobSubsidy", type = "decimal", explain = "公司一次性就业补助金")
@TableField("jobSubsidy")
+ @ExcelField(value = "公司一次性就业补助金")
private BigDecimal jobSubsidy = BigDecimal.ZERO;
@FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
@TableField("settleStatus")
+ @ExcelField(value = "是否已报告", writeConverterExp = "0=未结案,1=已结案")
private Integer settleStatus = 0;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
index 214c564..ecc0073 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_physicalexam")
+@Excel("员工体检信息")
public class EmpPhysicalExam implements Serializable {
@FieldInfo(name = "physicalExamId", type = "bigint", explain = "体检Id")
@@ -40,22 +44,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -64,6 +73,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -72,10 +82,12 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "hospital", type = "varchar", explain = "体检医院")
@TableField("hospital")
+ @ExcelField(value = "体检医院")
private String hospital = "";
@FieldInfo(name = "physicalExamDate", type = "date", explain = "体检日期")
@@ -83,34 +95,42 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "体检日期", writeConverter = TimeConverter.class)
private Date physicalExamDate;
@FieldInfo(name = "physicalExamType", type = "varchar", explain = "体检类型")
@TableField("physicalExamType")
+ @ExcelField(value = "体检类型", writeConverterExp = "1=入职体检,2=员工体检")
private String physicalExamType = "";
@FieldInfo(name = "bloodPressure", type = "varchar", explain = "血压")
@TableField("bloodPressure")
+ @ExcelField(value = "血压")
private String bloodPressure = "";
@FieldInfo(name = "transaminase", type = "varchar", explain = "转氨酶")
@TableField("transaminase")
+ @ExcelField(value = "转氨酶")
private String transaminase = "";
@FieldInfo(name = "ecg", type = "varchar", explain = "心电图")
@TableField("ecg")
+ @ExcelField(value = "心电图")
private String ecg = "";
@FieldInfo(name = "conclusion", type = "varchar", explain = "体检结论")
@TableField("conclusion")
+ @ExcelField(value = "体检结论")
private String conclusion = "";
@FieldInfo(name = "reviewRecord", type = "varchar", explain = "复查记录")
@TableField("reviewRecord")
+ @ExcelField(value = "复查记录")
private String reviewRecord = "";
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
+ @ExcelField(value = "备注")
private String remark = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
index 08dbf67..0410d4b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_remarkinfo")
+@Excel("员工备注信息")
public class EmpRemarkInfo implements Serializable {
private static final long serialVersionUID = 3084540653935731579L;
@@ -41,18 +45,22 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -61,6 +69,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -69,10 +78,12 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "remarkContent", type = "varchar", explain = "备注内容")
@TableField("remarkContent")
+ @ExcelField(value = "备注内容")
private String remarkContent = "";
@FieldInfo(name = "remarkDate", type = "date", explain = "备注日期")
@@ -80,6 +91,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "备注日期", writeConverter = TimeConverter.class)
private Date remarkDate;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
index 67960ff..711af74 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_resign")
+@Excel("员工辞职申请")
public class EmpResign implements Serializable {
private static final long serialVersionUID = -4692256235815402125L;
@@ -41,18 +45,22 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -61,6 +69,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -69,6 +78,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
@@ -76,14 +86,17 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
private Date applayDate;
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
+ @ExcelField(value = "报备人")
private String reporter = "";
@FieldInfo(name = "reason", type = "varchar", explain = "事由")
@TableField("reason")
+ @ExcelField(value = "事由")
private String reason = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
index be3c8b8..b1f8620 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_unemployment")
+@Excel("失业金领取")
public class EmpUnemployment implements Serializable {
@FieldInfo(name = "unemploymentId", type = "bigint", explain = "失业金领取Id")
@@ -40,18 +44,22 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb = "";
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb = "";
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -60,6 +68,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@@ -68,6 +77,7 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
@@ -75,22 +85,27 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
private Date applayDate;
@FieldInfo(name = "applayReason", type = "varchar", explain = "申报事由")
@TableField("applayReason")
+ @ExcelField(value = "申报事由")
private String applayReason = "";
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
+ @ExcelField(value = "报备人")
private String reporter = "";
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@TableField("auditor")
+ @ExcelField(value = "审核人")
private String auditor = "";
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
+ @ExcelField(value = "备注")
private String remark = "";
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
index f6e250a..dc5270d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
@@ -4,12 +4,15 @@
import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -28,6 +31,7 @@
*/
@Data
@TableName("t_emp_workExperience")
+@Excel("员工工作经历")
public class EmpWorkExperience implements Serializable {
@FieldInfo(name = "workExperienceId", type = "bigint", explain = "工作经历Id")
@@ -40,22 +44,27 @@
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
+ @ExcelField(value = "员工编号")
private String empNumb;
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
+ @ExcelField(value = "员工姓名")
private String empName;
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
private String certificateNumb;
@FieldInfo(name = "sex", type = "varchar", explain = "性别码，使用国标性别性别码")
@TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex;
@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -64,6 +73,7 @@
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
@TableField("deptName")
+ @ExcelField(value = "部门名称")
private String deptName = "";
@FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
@@ -72,10 +82,12 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
+ @ExcelField(value = "岗位名称")
private String jobName = "";
@FieldInfo(name = "workUnit", type = "varchar", explain = "工作单位")
@TableField("workUnit")
+ @ExcelField(value = "工作单位")
private String workUnit;
@FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
@@ -83,6 +95,7 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "开始日期", writeConverter = TimeConverter.class)
private Date beginDate;
@FieldInfo(name = "endDate", type = "date", explain = "结束日期")
@@ -90,10 +103,12 @@
@JsonSerialize(using = DateSerializer.class)
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "结束日期", writeConverter = TimeConverter.class)
private Date endDate;
@FieldInfo(name = "jobContent", type = "varchar", explain = "主要工作内容")
@TableField("jobContent")
+ @ExcelField(value = "主要工作内容")
private String jobContent;
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
--
Gitblit v1.8.0