From 9ec124ecb9239091d537c71fe907f9a1bb3e135f Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期日, 07 三月 2021 21:44:02 +0800
Subject: [PATCH] 增加导出
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java | 22
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 26
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml | 12
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java | 20
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java | 1
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java | 26
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 32
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/DicMapper.java | 61 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 9
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 54 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 22
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 28
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dic.java | 5
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 28
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java | 28
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java | 24
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java | 197 ++++++++++
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java | 3
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java | 29 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java | 18
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IDicItemService.java | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java | 22
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java | 135 +++---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java | 24
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpUnemployment.java | 24
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDicItemService.java | 3
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java | 3
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/DicItem.java | 5
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java | 14
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 14
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 151 +++++++
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java | 9
34 files changed, 718 insertions(+), 341 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
index bfcc26e..1fdb561 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dept.java
@@ -47,7 +47,7 @@
@ExcelField(value = "修改时间", writeConverter = TimeConverter.class)
private Date modifyTime;
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
@@ -71,4 +71,4 @@
private transient String createTimeTo;
-}
\ No newline at end of file
+}
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dic.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dic.java
index 67a6e28..826e4de 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dic.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Dic.java
@@ -43,12 +43,11 @@
@TableField("dicDescribe")
private String dicDescribe = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
-}
\ No newline at end of file
+}
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/DicItem.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/DicItem.java
index 5129aca..551aba4 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/DicItem.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/DicItem.java
@@ -50,13 +50,12 @@
@TableField("dicCode")
private String dicCode = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
-}
\ No newline at end of file
+}
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
index 101ceea..aed8afb 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
@@ -72,9 +72,8 @@
@TableField("delFlag")
private Integer delFlag=0;
- @FieldInfo(name = "version",type = "int",explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version=0;
-}
\ No newline at end of file
+}
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java
index 5c98255..9a7143c 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java
@@ -1,10 +1,13 @@
package cc.mrbird.febs.common.core.utils;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.entity.CurrentUser;
import cc.mrbird.febs.common.core.entity.FebsAuthUser;
import cc.mrbird.febs.common.core.entity.constant.PageConstant;
import cc.mrbird.febs.common.core.entity.constant.RegexpConstant;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
+import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.util.ReflectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,10 +32,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.lang.reflect.Field;
import java.time.LocalDateTime;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import java.util.stream.IntStream;
/**
@@ -284,7 +289,7 @@
}
}
- public static String getUserId(){
+ public static String getUserId() {
return Optional.ofNullable(getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
@@ -345,4 +350,26 @@
private static LinkedHashMap<String, Object> getAuthenticationDetails() {
return (LinkedHashMap<String, Object>) getOauth2Authentication().getUserAuthentication().getDetails();
}
+
+ /**
+ * 通过反射拿到注解
+ *
+ * @param beanClass
+ * @return java.lang.String
+ * @description
+ * @author yz
+ * @date 2021/3/7 2:25 下午
+ * @method reflectAnnotation
+ */
+ public static String reflectAnnotation(Class<?> beanClass) {
+ Field[] fields = ReflectUtil.getFields(beanClass);
+ List<String> list = new ArrayList<>();
+ for (Field field : fields) {
+ FieldInfo fieldInfo = field.getAnnotation(FieldInfo.class);
+ if (null != fieldInfo) {
+ list.add(field.getName());
+ }
+ }
+ return list.stream().collect(Collectors.joining(StringConstant.COMMA));
+ }
}
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 d982272..33d0676 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,10 +11,12 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cn.hutool.core.annotation.AnnotationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wuwenze.poi.ExcelKit;
@@ -211,6 +213,13 @@
boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "exportEmpAll",method= RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void exportEmpAll(HttpServletResponse response,EmpBaseInfo empBaseinfo) throws IOException {
+ this.empBaseInfoService.exportEmpAll(response,empBaseinfo);
+ }
+
@ApiOperation(value = "导入员工")
@PostMapping("importEmp")
public FebsResponse importEmp(MultipartFile file) {
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 c3da008..114d606 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
@@ -24,15 +24,14 @@
import java.util.Map;
/**
-*
-* name:EmpLeaveinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工请假记录控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:13
-* @since JDK1.8
-*/
+ * name:EmpLeaveinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工请假记录控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:13
+ * @since JDK1.8
+ */
@Api(tags = "人员请假信息录入接口")
@Slf4j
@Validated
@@ -41,80 +40,82 @@
@RequiredArgsConstructor
public class EmpLeaveInfoController {
-private final IEmpLeaveInfoService empLeaveinfoService;
+ private final IEmpLeaveInfoService empLeaveinfoService;
-@GetMapping
-@PreAuthorize("hasAuthority('empLeaveinfo:list')")
-public FebsResponse getAllEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
-return new FebsResponse().data(empLeaveinfoService.findEmpLeaveInfos(empLeaveinfo));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empLeaveinfo:list')")
+ public FebsResponse getAllEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
+ return new FebsResponse().data(empLeaveinfoService.findEmpLeaveInfos(empLeaveinfo));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empLeaveinfo:list')")
-public FebsResponse empLeaveinfoList(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLeaveinfoService.findEmpLeaveInfos(request, empLeaveinfo));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empLeaveinfo:list')")
+ public FebsResponse empLeaveinfoList(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLeaveinfoService.findEmpLeaveInfos(request, empLeaveinfo));
+ return new FebsResponse().data(dataTable);
+ }
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpLeaveInfo empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empLeaveinfoService.count());
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 {
-try {
-this.empLeaveinfoService.createEmpLeaveinfo(empLeaveinfo);
-} catch (Exception e) {
-String message = "新增员工请假记录失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-@DeleteMapping
-@PreAuthorize("hasAuthority('empLeaveinfo:delete')")
-public void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) throws FebsException {
-try {
-this.empLeaveinfoService.deleteEmpLeaveinfo(empLeaveinfo);
-} catch (Exception e) {
-String message = "删除员工请假记录失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empLeaveinfo:add')")
+ public void addEmpLeaveinfo(@Valid EmpLeaveInfo empLeaveinfo) throws FebsException {
+ try {
+ this.empLeaveinfoService.createEmpLeaveinfo(empLeaveinfo);
+ } catch (Exception e) {
+ String message = "新增员工请假记录失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empLeaveinfo:delete')")
-public void logicDeleteEmpLeaveinfo(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empLeaveinfoService.logicDelEmpLeaveinfo(ids);
-} catch (Exception e) {
-String message = "逻辑删除员工请假记录失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empLeaveinfo:delete')")
+ public void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) throws FebsException {
+ try {
+ this.empLeaveinfoService.deleteEmpLeaveinfo(empLeaveinfo);
+ } catch (Exception e) {
+ String message = "删除员工请假记录失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empLeaveinfo:update')")
-public void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) throws FebsException {
-try {
-this.empLeaveinfoService.updateEmpLeaveinfo(empLeaveinfo);
-} catch (Exception e) {
-String message = "修改员工请假记录失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empLeaveinfo:delete')")
+ public void logicDeleteEmpLeaveinfo(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empLeaveinfoService.logicDelEmpLeaveinfo(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除员工请假记录失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empLeaveinfo:update')")
+ public void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) throws FebsException {
+ try {
+ this.empLeaveinfoService.updateEmpLeaveinfo(empLeaveinfo);
+ } catch (Exception e) {
+ String message = "修改员工请假记录失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "请假申请信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empLeaveinfo:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empLeaveinfoService.momentToNormal(ids);
} catch (Exception e) {
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 8de206d..7125e53 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
@@ -38,11 +38,11 @@
public class EmpAccidentCases implements Serializable {
private static final long serialVersionUID = 3423747469056866015L;
- @FieldInfo(name = "accidentId", type = "bigint", explain = "案件Id")
+ //@FieldInfo(name = "accidentId", type = "bigint", explain = "案件Id")
@TableId(value = "accidentId")
private Long accidentId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -55,7 +55,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -71,7 +71,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -80,7 +80,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -200,40 +200,40 @@
@ExcelField(value = "备注")
private String remark = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
-
+
@TableField(exist = false)
private String injuredTimeStr;
-
+
@TableField(exist = false)
private String hrDoDateStr;
-}
\ No newline at end of file
+}
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 c990143..b4064ee 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
@@ -35,11 +35,11 @@
public class EmpBadRecord implements Serializable {
private static final long serialVersionUID = 3681849796837950530L;
- @FieldInfo(name = "badId", type = "bigint", explain = "不良记录Id")
+ //@FieldInfo(name = "badId", type = "bigint", explain = "不良记录Id")
@TableId(value = "badId")
private Long badId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -63,7 +63,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -72,7 +72,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -99,33 +99,33 @@
@ExcelField(value = "不良记录描述")
private String badContent = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -133,7 +133,7 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
-
+
@TableField(exist = false)
private String badDateStr= "";
@@ -141,4 +141,4 @@
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
-}
\ No newline at end of file
+}
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 6e106e9..9e83cae 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
@@ -36,11 +36,11 @@
@Excel("员工基本信息表")
public class EmpBaseInfo implements Serializable {
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableId(value = "empId")
private Long empId = 0L;
- @FieldInfo(name = "customerId", type = "bigint", explain = "租户Id")
+ //@FieldInfo(name = "customerId", type = "bigint", explain = "租户Id")
@TableField("customerId")
private Long customerId = 0L;
@@ -49,7 +49,7 @@
@ExcelField(value = "档案号")
private String archivesNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -76,11 +76,11 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
- @FieldInfo(name = "sexName", type = "varchar", explain = "性别")
+ //@FieldInfo(name = "sexName", type = "varchar", explain = "性别")
@TableField(exist = false)
private String sexName = "";
- @FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("jobId")
private Long jobId = 0L;
@@ -90,12 +90,12 @@
private String jobName = "";
@NotBlank(message = "{required}")
- @FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类别字典表")
+ @FieldInfo(name = "empType", type = "varchar", explain = "员工类别")
@TableField("empType")
@ExcelField(value = "员工类别", writeConverterExp = "1=正式工,2=临时工")
private String empType = "";
- @FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别")
+ //@FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别")
@TableField(exist = false)
private String empTypeName = "";
@@ -112,7 +112,7 @@
@TableField("nation")
private String nation = "";
- @FieldInfo(name = "nationName", type = "varchar", explain = "民族")
+ //@FieldInfo(name = "nationName", type = "varchar", explain = "民族")
@TableField(exist = false)
@ExcelField(value = "民族")
private String nationName = "";
@@ -129,7 +129,7 @@
@TableField("marriage")
private String marriage = "";
- @FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
+ //@FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
@TableField(exist = false)
@ExcelField(value = "婚姻状况")
private String marriageName = "";
@@ -156,7 +156,7 @@
@TableField("politics")
private String politics = "";
- @FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
+ //@FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
@TableField(exist = false)
@ExcelField(value = "政治面貌")
private String politicsName = "";
@@ -181,7 +181,7 @@
@TableField("education")
private String education = "";
- @FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
+ //@FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
@TableField(exist = false)
@ExcelField(value = "最高学历")
private String educationName = "";
@@ -195,7 +195,7 @@
@TableField("nativePlace")
private String nativePlace = "";
- @FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
+ //@FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
@TableField(exist = false)
@ExcelField(value = "籍贯")
private String nativePlaceName = "";
@@ -234,7 +234,7 @@
@TableField("archivesStatus")
private String archivesStatus = "";
- @FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
+ //@FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
@TableField(exist = false)
@ExcelField(value = "档案情况")
private String archivesStatusName = "";
@@ -253,7 +253,7 @@
@TableField("InsuranceType")
private String insuranceType = "";
- @FieldInfo(name = "InsuranceTypeName", type = "varchar", explain = "保险类型")
+ //@FieldInfo(name = "InsuranceTypeName", type = "varchar", explain = "保险类型")
@TableField(exist = false)
@ExcelField(value = "保险类型")
private String insuranceTypeName = "";
@@ -272,8 +272,8 @@
@TableField("handbookStatus")
@ExcelField(value = "员工手册", writeConverterExp = "0=未发,1=已发")
private String handbookStatus = "";
-
- @FieldInfo(name = "handbookStatusName", type = "varchar", explain = "员工手册")
+
+ //@FieldInfo(name = "handbookStatusName", type = "varchar", explain = "员工手册")
@TableField(exist = false)
@ExcelField(value = "员工手册")
private String handbookStatusName = "";
@@ -287,8 +287,8 @@
@TableField("empCardStatus")
@ExcelField(value = "工作证", writeConverterExp = "0=未发,1=已发")
private String empCardStatus = "";
-
- @FieldInfo(name = "empCardStatusName", type = "varchar", explain = "工作证")
+
+ //@FieldInfo(name = "empCardStatusName", type = "varchar", explain = "工作证")
@TableField(exist = false)
@ExcelField(value = "工作证")
private String empCardStatusName = "";
@@ -297,7 +297,7 @@
@TableField("certificateList")
private String certificateList = "";
- @FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
+ //@FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
@TableField(exist = false)
@ExcelField(value = "相关证件", writeConverterExp = "1=高中毕业证,2=专科毕业证,3=本科毕业证")
private String certificateListName = "";
@@ -316,37 +316,37 @@
@TableField("entryType")
private String entryType = "01";
- @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ //@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
@TableField(exist = false)
private String entryTypeName = "正常入职";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "int", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "int", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -417,4 +417,4 @@
@TableField(exist = false)
private String reporter;
-}
\ No newline at end of file
+}
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 2f5927c..550ffee 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
@@ -35,11 +35,11 @@
public class EmpContractInfo implements Serializable {
private static final long serialVersionUID = 4152214737054224645L;
- @FieldInfo(name = "contractId", type = "bigint", explain = "合同Id")
+ //@FieldInfo(name = "contractId", type = "bigint", explain = "合同Id")
@TableId(value = "contractId")
private Long contractId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -68,7 +68,7 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -77,7 +77,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ ////@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -130,33 +130,33 @@
@ExcelField(value = "备注")
private String remark = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -171,4 +171,4 @@
@TableField(exist = false)
private String contractStatusName = "";
-}
\ No newline at end of file
+}
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 edd0c56..991afd1 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
@@ -37,11 +37,11 @@
public class EmpDimissionAttend implements Serializable {
private static final long serialVersionUID = 6080263775807562989L;
- @FieldInfo(name = "dimissionAttendId", type = "bigint", explain = "离职当月考勤Id")
+ //@FieldInfo(name = "dimissionAttendId", type = "bigint", explain = "离职当月考勤Id")
@TableId(value = "dimissionAttendId")
private Long dimissionAttendId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -54,7 +54,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -70,7 +70,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -79,7 +79,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -87,7 +87,7 @@
@TableField("jobName")
@ExcelField(value = "岗位名称")
private String jobName = "";
-
+
@FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
@TableField(exist = false)
@ExcelField(value = "考勤年份")
@@ -128,33 +128,33 @@
@ExcelField(value = "旷工（天）")
private BigDecimal absenteeism = BigDecimal.ZERO;
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -162,8 +162,8 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
-
+
@TableField(exist = false)
private String deductStr;
-}
\ No newline at end of file
+}
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 7a8cfbe..2cfefef 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
@@ -37,11 +37,11 @@
@Excel("员工离职记录")
public class EmpDimissionLog implements Serializable {
- @FieldInfo(name = "closeId", type = "bigint", explain = "档案关闭Id")
+ //@FieldInfo(name = "closeId", type = "bigint", explain = "档案关闭Id")
@TableId(value = "closeId")
private Long closeId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -81,25 +81,25 @@
@ExcelField(value = "备注")
private String remark = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
@@ -107,7 +107,7 @@
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
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 bac387d..c0ceb85 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
@@ -35,11 +35,11 @@
public class EmpInsurance implements Serializable {
private static final long serialVersionUID = 208703298339870887L;
- @FieldInfo(name = "insuranceId", type = "bigint", explain = "社保Id")
+ //@FieldInfo(name = "insuranceId", type = "bigint", explain = "社保Id")
@TableId(value = "insuranceId")
private Long insuranceId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -52,7 +52,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -68,7 +68,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -77,7 +77,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -122,33 +122,33 @@
@ExcelField(value = "审核人")
private String auditor = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -156,8 +156,8 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
-
+
@TableField(exist = false)
private String applayDateStr;
-}
\ No newline at end of file
+}
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 0b998d9..10e8c24 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
@@ -35,11 +35,11 @@
public class EmpJobChange implements Serializable {
private static final long serialVersionUID = 4229887878987429956L;
- @FieldInfo(name = "jobChangeId", type = "bigint", explain = "岗位调整Id")
+ //@FieldInfo(name = "jobChangeId", type = "bigint", explain = "岗位调整Id")
@TableId(value = "jobChangeId")
private Long jobChangeId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -86,25 +86,25 @@
@ExcelField(value = "调岗原因")
private String changeReason = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
@@ -112,7 +112,7 @@
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
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 177c543..ac78cf7 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
@@ -38,11 +38,11 @@
public class EmpLaborTrouble implements Serializable {
private static final long serialVersionUID = -7587978188799851715L;
- @FieldInfo(name = "arbitrationId", type = "bigint", explain = "仲裁Id")
+ //@FieldInfo(name = "arbitrationId", type = "bigint", explain = "仲裁Id")
@TableId(value = "arbitrationId")
private Long arbitrationId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -55,7 +55,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -70,7 +70,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -79,7 +79,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -133,33 +133,33 @@
@ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
private Date settleDate;
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -167,11 +167,11 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
-
+
@TableField(exist = false)
private String arbitrationDateStr= "";
-
+
@TableField(exist = false)
private String settleDateStr= "";
-}
\ No newline at end of file
+}
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 1f0fb2c..2d7e38d 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
@@ -38,11 +38,11 @@
public class EmpLeaveInfo implements Serializable {
private static final long serialVersionUID = -906183894054123470L;
- @FieldInfo(name = "leaveId", type = "bigint", explain = "请假申请Id")
+ //@FieldInfo(name = "leaveId", type = "bigint", explain = "请假申请Id")
@TableId(value = "leaveId")
private Long leaveId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -55,7 +55,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -71,7 +71,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -80,7 +80,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -133,33 +133,33 @@
@ExcelField(value = "到岗时间", writeConverter = TimeConverter.class)
private Date returnDate;
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -167,8 +167,8 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
-
+
@TableField(exist = false)
private String leaveDateStr= "";
-}
\ No newline at end of file
+}
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 0c344f5..74eeb93 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
@@ -38,11 +38,11 @@
public class EmpOccupational implements Serializable {
private static final long serialVersionUID = 5704201515491620531L;
- @FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
+ //@FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
@TableId("occupationalId")
private Long occupationalId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -55,7 +55,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -71,7 +71,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -80,7 +80,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -237,33 +237,33 @@
@ExcelField(value = "是否已报告", writeConverterExp = "0=未结案,1=已结案")
private Integer settleStatus = 0;
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -271,12 +271,12 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
-
+
@FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
@TableField("expenseReport")
@ExcelField(value = "报单号")
private String expenseReport = "";
-
+
@FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
@TableField("settleDate")
@JsonSerialize(using = DateSerializer.class)
@@ -284,14 +284,14 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
private Date settleDate;
-
+
@TableField(exist = false)
private String hrDoDateStr= "";
-
+
@TableField(exist = false)
private String injuredTimeStr= "";
@FieldInfo(name = "settleStatusName", type = "bit", explain = "结案状态 0-未结案 1-已结案")
@TableField(exist = false)
private String settleStatusName = "";
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
index d907ca4..700d01d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOpenArchives.java
@@ -32,7 +32,7 @@
private static final long serialVersionUID = 7460933384023908695L;
- @FieldInfo(name = "openArchivesId", type = "bigint", explain = "打开档案Id")
+ //@FieldInfo(name = "openArchivesId", type = "bigint", explain = "打开档案Id")
@TableId(value = "openArchivesId")
private Long openArchivesId = 0L;
@@ -47,7 +47,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date openDate;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -63,35 +63,35 @@
@TableField("remark")
private String remark = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
-}
\ No newline at end of file
+}
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 ecc0073..89e59ca 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
@@ -34,11 +34,11 @@
@Excel("员工体检信息")
public class EmpPhysicalExam implements Serializable {
- @FieldInfo(name = "physicalExamId", type = "bigint", explain = "体检Id")
+ //@FieldInfo(name = "physicalExamId", type = "bigint", explain = "体检Id")
@TableId(value = "physicalExamId")
private Long physicalExamId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -67,7 +67,7 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -76,7 +76,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -133,33 +133,33 @@
@ExcelField(value = "备注")
private String remark = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -175,4 +175,4 @@
@TableField(exist = false)
private String ecgName = "";
-}
\ No newline at end of file
+}
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 1f80f4d..eec50bb 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
@@ -35,11 +35,11 @@
public class EmpRemarkInfo implements Serializable {
private static final long serialVersionUID = 3084540653935731579L;
- @FieldInfo(name = "remarkId", type = "bigint", explain = "备注Id")
+ //@FieldInfo(name = "remarkId", type = "bigint", explain = "备注Id")
@TableId(value = "remarkId")
private Long remarkId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -63,7 +63,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -72,7 +72,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -94,40 +94,40 @@
@ExcelField(value = "备注日期", writeConverter = TimeConverter.class)
private Date remarkDate;
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
-
+
@TableField(exist = false)
private String remarkDateStr= "";
@TableField(exist = false)
private String empStatus;
-}
\ No newline at end of file
+}
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 e94458e..c80b0db 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
@@ -35,11 +35,11 @@
public class EmpResign implements Serializable {
private static final long serialVersionUID = -4692256235815402125L;
- @FieldInfo(name = "resignId", type = "bigint", explain = "辞职Id")
+ //@FieldInfo(name = "resignId", type = "bigint", explain = "辞职Id")
@TableId(value = "resignId")
private Long resignId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -63,7 +63,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -72,7 +72,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -99,33 +99,33 @@
@ExcelField(value = "事由")
private String reason = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -140,4 +140,4 @@
@TableField(exist = false)
private String empStatus;
-}
\ No newline at end of file
+}
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 a4eebfb..8666ddb 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
@@ -34,11 +34,11 @@
@Excel("失业金领取")
public class EmpUnemployment implements Serializable {
- @FieldInfo(name = "unemploymentId", type = "bigint", explain = "失业金领取Id")
+ //@FieldInfo(name = "unemploymentId", type = "bigint", explain = "失业金领取Id")
@TableId(value = "unemploymentId")
private Long unemploymentId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -62,7 +62,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -71,7 +71,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -109,40 +109,40 @@
private String remark = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
-
+
@TableField(exist = false)
private String applayDateStr;
@TableField(exist = false)
private String empStatus;
-}
\ No newline at end of file
+}
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 72948e2..56755e9 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
@@ -34,11 +34,11 @@
@Excel("员工工作经历")
public class EmpWorkExperience implements Serializable {
- @FieldInfo(name = "workExperienceId", type = "bigint", explain = "工作经历Id")
+ //@FieldInfo(name = "workExperienceId", type = "bigint", explain = "工作经历Id")
@TableId(value = "workExperienceId")
private Long workExperienceId;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId;
@@ -67,7 +67,7 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex;
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -76,7 +76,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("jobId")
private Long jobId = 0L;
@@ -111,33 +111,33 @@
@ExcelField(value = "主要工作内容")
private String jobContent;
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator;
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier;
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version;
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDicItemService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDicItemService.java
index 687ec7a..c233da2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDicItemService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteDicItemService.java
@@ -28,4 +28,7 @@
@GetMapping("dept/userRightDepts")
String userRightDepts();
+
+ @GetMapping("dicItem/getAllDicitemsAll")
+ List<DicItem> getAllDicitemsAll();
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java
index df31025..771e146 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.java
@@ -47,4 +47,5 @@
IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
+ IPage<EmpJobChange> selectPageVoBean(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
index bb0ee06..5120776 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
@@ -2,9 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper">
- <select id="selectPageVo" resultType="java.util.Map">
- select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a
- inner join t_emp_baseinfo b on a.empId = b.empId
+ <select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
+ select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a
+ inner join t_emp_baseinfo b on a.empId = b.empId
+ inner join t_dept c on b.deptId = c.DEPT_ID
+ ${ew.customSqlSegment}
+ </select>
+ <select id="selectPageVoBean" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
+ select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a
+ inner join t_emp_baseinfo b on a.empId = b.empId
inner join t_dept c on b.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
index e4ad447..74188ee 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java
@@ -11,6 +11,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -194,4 +195,6 @@
Long getEmpIdByEmpNumb(String empNumb);
EmpBaseInfo getEmpBaseInfoByEmpNumb(String empNumb);
+
+ void exportEmpAll(HttpServletResponse response,EmpBaseInfo empBaseinfo) throws IOException;
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index a4f034d..f5a05f8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -1,11 +1,9 @@
package cc.mrbird.febs.server.hr.service.impl;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
import java.util.*;
import java.util.function.Consumer;
+import java.util.stream.Collectors;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.SysConfig;
@@ -13,16 +11,17 @@
import cc.mrbird.febs.common.core.utils.MyUtil;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.feign.IRemoteDicItemService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
-import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
+import cc.mrbird.febs.server.hr.mapper.*;
import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
-import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
-import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
-import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
+import cc.mrbird.febs.server.hr.service.*;
+import cc.mrbird.febs.server.hr.util.PoiExportExcel;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cc.mrbird.febs.server.hr.entity.*;
import cn.hutool.core.util.StrUtil;
+import io.prometheus.client.Collector;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -45,8 +44,6 @@
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
-import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
-import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import lombok.RequiredArgsConstructor;
import org.springframework.util.FileSystemUtils;
import org.springframework.validation.annotation.Validated;
@@ -74,6 +71,19 @@
private final EmpContractInfoMapper empContractInfoMapper;
private final FebsServerHrProperties properties;
private final IRemoteDeptService remoteDeptService;
+ private final EmpWorkExperienceMapper empWorkExperienceMapper;
+ private final EmpPhysicalExamMapper empPhysicalExamMapper;
+ private final EmpJobChangeMapper empJobChangeMapper;
+ private final EmpLeaveInfoMapper empLeaveInfoMapper;
+ private final EmpUnemploymentMapper empUnemploymentMapper;
+ private final EmpDimissionAttendMapper empDimissionAttendMapper;
+ private final EmpInsuranceMapper empInsuranceMapper;
+ private final EmpAccidentCasesMapper empAccidentCasesMapper;
+ private final EmpLaborTroubleMapper empLaborTroubleMapper;
+ private final EmpBadRecordMapper empBadRecordMapper;
+ private final EmpRemarkInfoMapper empRemarkInfoMapper;
+ private final IRemoteDicItemService remoteDicItemService;
+
private final String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
@Override
@@ -944,4 +954,125 @@
}
}
+
+ @Override
+ public void exportEmpAll(HttpServletResponse response, EmpBaseInfo empBaseinfo) throws IOException {
+ //获取字典
+ List<DicItem> dicItemList = remoteDicItemService.getAllDicitemsAll();
+ Map<String, Object> map = new HashMap<>();
+
+ List<Long> itemCode = dicItemList.stream().map(i->i.getDicId()).distinct().collect(Collectors.toList());
+ itemCode.stream().forEach(i->{
+ List<DicItem> dicItems = dicItemList.stream().filter(j->j.getDicId().equals(i)).collect(Collectors.toList());
+ Map<String, Object> itemMap = new HashMap<>();
+ dicItems.stream().forEach(dicItem -> itemMap.put(dicItem.getDicItemCode(),dicItem.getDicItemName()));
+ map.put(dicItems.get(0).getDicCode().toLowerCase(),itemMap);
+ });
+
+ //基本信息
+ QueryRequest request = new QueryRequest();
+ request.setPageSize(25535);
+ request.setPageNum(1);
+ List<EmpBaseInfo> exportList = this.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
+ List<Map<String, Object>> listMapDicItem = new ArrayList();
+ listMapDicItem.add(map);
+ String exportField = FebsUtil. reflectAnnotation(EmpBaseInfo.class);
+ List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, listMapDicItem);
+ Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ List<Long> empIds = exportList.stream().map(i->i.getEmpId()).collect(Collectors.toList());
+
+ //工作经历
+ IPage<EmpWorkExperience> workExperienceIPage = empWorkExperienceMapper.selectPageVo(page,new QueryWrapper<EmpWorkExperience>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpWorkExperience.class);
+ List<Map<String, Object>> allListEmpWork = PoiExportExcel.getDataList(exportField, workExperienceIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpWork.get(0));
+
+ //体检信息
+ IPage<EmpPhysicalExam> empPhysicalExamIPage = empPhysicalExamMapper.selectPageVo(page,new QueryWrapper<EmpPhysicalExam>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpWorkExperience.class);
+ List<Map<String, Object>> allListEmpPhysical = PoiExportExcel.getDataList(exportField, empPhysicalExamIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpPhysical.get(0));
+
+
+ //调岗记录
+ IPage<EmpJobChange> jobChangeIPage = empJobChangeMapper.selectPageVoBean(page,new QueryWrapper<EmpJobChange>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpJobChange.class);
+ List<Map<String, Object>> allListjobChangeI = PoiExportExcel.getDataList(exportField, jobChangeIPage.getRecords(), listMapDicItem);
+ allList.add(allListjobChangeI.get(0));
+
+ //合同信息
+ IPage<EmpContractInfo> empContractInfoIPage = empContractInfoMapper.selectPageVo(page,new QueryWrapper<EmpContractInfo>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpContractInfo.class);
+ List<Map<String, Object>> allListEmpContractInfo = PoiExportExcel.getDataList(exportField, empContractInfoIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpContractInfo.get(0));
+
+ //入离职记录
+ IPage<EmpDimissionAttend> empDimissionAttendIPage = empDimissionAttendMapper.selectPageVo(page,new QueryWrapper<EmpDimissionAttend>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpDimissionAttend.class);
+ List<Map<String, Object>> allListEmpDimissionAtt = PoiExportExcel.getDataList(exportField, empDimissionAttendIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpDimissionAtt.get(0));
+
+ //请假记录
+ IPage<EmpLeaveInfo> empLeaveInfoIPage = empLeaveInfoMapper.selectPageVo(page,new QueryWrapper<EmpLeaveInfo>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpLeaveInfo.class);
+ List<Map<String, Object>> allListEmpLoeaveInfo = PoiExportExcel.getDataList(exportField, empLeaveInfoIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpLoeaveInfo.get(0));
+
+ //失业金领取
+ IPage<EmpUnemployment> empUnemploymentIPage = empUnemploymentMapper.selectPageVo(page,new QueryWrapper<EmpUnemployment>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpUnemployment.class);
+ List<Map<String, Object>> allListEmpUnemployment = PoiExportExcel.getDataList(exportField, empUnemploymentIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpUnemployment.get(0));
+
+
+ //社保申请
+ IPage<EmpInsurance> empInsuranceIPage = empInsuranceMapper.selectPageVo(page,new QueryWrapper<EmpInsurance>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpInsurance.class);
+ List<Map<String, Object>> allListEmpInsurance = PoiExportExcel.getDataList(exportField, empInsuranceIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpInsurance.get(0));
+
+ //意外险案件
+ IPage<EmpAccidentCases> empAccidentCasesIPage = empAccidentCasesMapper.selectPageVo(page,new QueryWrapper<EmpInsurance>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpAccidentCases.class);
+ List<Map<String, Object>> allListEmpAccidentCases = PoiExportExcel.getDataList(exportField, empAccidentCasesIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpAccidentCases.get(0));
+
+
+ //劳资案件
+ IPage<EmpLaborTrouble> empLaborTroubleIPage = empLaborTroubleMapper.selectPageVo(page,new QueryWrapper<EmpInsurance>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpLaborTrouble.class);
+ List<Map<String, Object>> allListEmpLaborTrouble = PoiExportExcel.getDataList(exportField, empLaborTroubleIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpLaborTrouble.get(0));
+
+ //不良记录
+ IPage<EmpBadRecord> empBadRecordIPage = empBadRecordMapper.selectPageVo(page,new QueryWrapper<EmpInsurance>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpBadRecord.class);
+ List<Map<String, Object>> allListEmpBadRecord = PoiExportExcel.getDataList(exportField, empBadRecordIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpBadRecord.get(0));
+
+ //备注信息
+ IPage<EmpRemarkInfo> empRemarkInfoIPage = empRemarkInfoMapper.selectPageVo(page,new QueryWrapper<EmpRemarkInfo>().in("a.empId",empIds).ne("a.delFlag",1));
+ exportField = FebsUtil. reflectAnnotation(EmpRemarkInfo.class);
+ List<Map<String, Object>> allListEmpRemarkInfo = PoiExportExcel.getDataList(exportField, empRemarkInfoIPage.getRecords(), listMapDicItem);
+ allList.add(allListEmpRemarkInfo.get(0));
+
+
+
+ List<String> sheetNames = new ArrayList<>();
+ sheetNames.add("基本信息");
+ sheetNames.add("工作经历");
+ sheetNames.add("体检信息");
+ sheetNames.add("调岗记录");
+ sheetNames.add("合同信息");
+ sheetNames.add("入离职记录");
+ sheetNames.add("请假记录");
+ sheetNames.add("失业金领取");
+ sheetNames.add("社保申请");
+ sheetNames.add("意外险案件");
+ sheetNames.add("工商案件");
+ sheetNames.add("劳资案件");
+ sheetNames.add("不良记录");
+ sheetNames.add("备注信息");
+ boolean result = PoiExportExcel.exportCommonExcelMultiSheet(response, "在职员工列表",allList,sheetNames);
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java
index fa74fa1..e60e2f8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java
@@ -1360,7 +1360,7 @@
}
return result;
}
-
+
/*
* 获取导出数据的方法
*
@@ -1454,9 +1454,9 @@
}
if (null != listMapDicItem) {
for (int ss = 0; ss < listMapDicItem.size(); ss++) {
- if (null != listMapDicItem.get(ss).get(s[j])) {
- Map<String, String> mapDicItem = (Map<String, String>) listMapDicItem.get(ss)
- .get(s[j]);
+ //因为数据字典查出来之后改成了全小写，这里也改成全小些
+ if (null != listMapDicItem.get(ss).get(s[j].toLowerCase())) {
+ Map<String, String> mapDicItem = (Map<String, String>) listMapDicItem.get(ss).get(s[j].toLowerCase());
value = mapDicItem.get(value);
}
}
@@ -1482,5 +1482,192 @@
return allList;
}
-
+ public final static boolean exportCommonExcelMultiSheet(HttpServletResponse response, String fileName, List<Map<String, Object>> listContent,List<String> sheetTitle) throws IOException {
+ HSSFWorkbook workbook = new HSSFWorkbook();
+ boolean result = false;
+ OutputStream fileOutputStream = null;
+ response.reset();// 清空输出流
+ response.setHeader("Content-disposition",
+ "attachment; filename=" + new String((fileName + ".xls").getBytes("GB2312"), "ISO8859-1"));
+ response.setContentType("application/msexcel");
+
+ if (null != listContent && !listContent.isEmpty()) {
+ try {
+ // 处理数据
+ for (int k = 0; k < listContent.size(); k++) {
+ Sheet sheet = workbook.createSheet(sheetTitle.get(k));
+ // 创建基本的样式
+ CellStyle titleStyle = getCellStyle(workbook, "", (short) 20, true, HorizontalAlignment.CENTER,
+ VerticalAlignment.CENTER, true);
+ CellStyle headStyle = getCellStyle(workbook, "", (short) 9, true, HorizontalAlignment.CENTER,
+ VerticalAlignment.CENTER, true);
+ CellStyle textStyleCenter = getCellStyle(workbook, "", (short) 8, false, HorizontalAlignment.CENTER,
+ VerticalAlignment.CENTER, true);
+ CellStyle textStyleLeft = getCellStyle(workbook, "", (short) 8, false, HorizontalAlignment.LEFT,
+ VerticalAlignment.CENTER, true);
+ CellStyle textStyleRight = getCellStyle(workbook, "", (short) 8, false, HorizontalAlignment.RIGHT,
+ VerticalAlignment.CENTER, true);
+
+ int rowNum = 0; // 初始化第一行为0开始计数
+ int colCount = ((String[]) listContent.get(k).get("head")).length;// 表头的列数
+
+ // 第一行先创建一个大标题(当不为null的时候，设置这一行)
+ if (sheetTitle != null) {
+ titleStyle.setBorderTop(BorderStyle.NONE);
+ titleStyle.setBorderBottom(BorderStyle.NONE);
+ titleStyle.setBorderLeft(BorderStyle.NONE);
+ titleStyle.setBorderRight(BorderStyle.NONE);
+
+ Row sheetTitleRow = sheet.createRow(rowNum); // 创建标题行
+ sheetTitleRow.setHeight((short) 0x300); // 设置行高
+ Cell sheetTitleCell = sheetTitleRow.createCell(0); // 创建第一个单元格
+ sheetTitleCell.setCellStyle(titleStyle); // 设置标题的样式
+ sheetTitleCell.setCellValue(sheetTitle.get(k)); // 给标题格设定值
+ if (colCount != 1) {
+ sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 0, colCount - 1)); // 合并单元格(起始行，结束行，起始列，结束列)
+ }
+ // sheet.addMergedRegion(new CellRangeAddress(rowNum,
+ // rowNum, 0, colCount - 1)); // 合并单元格(起始行，结束行，起始列，结束列)
+ rowNum++;
+ }
+
+ // 获取数据
+ List<Map<String, String>> currentData = (List<Map<String, String>>) listContent.get(k).get("data");
+ String title = (String) listContent.get(k).get("title");
+ String[] headArray = (String[]) listContent.get(k).get("head");
+ Map<String, Integer> columnWidthArray = (Map<String, Integer>) listContent.get(k).get("columnWidth");
+ String[] pageHeadArray = (String[]) listContent.get(k).get("pageHead");
+ String[] pageFooterArray = (String[]) listContent.get(k).get("pageFooter");
+
+ // 设置标题栏内容(当不为null的时候，设置这一行)
+ if (title != null) {
+ if (rowNum > 1) { // 除了第一个表格的时候，后续表格和之前表格空三行
+ rowNum += 3;
+ }
+ Row titleRow = sheet.createRow(rowNum); // 标题行
+ titleRow.setHeight((short) 0x248); // 标题行高
+
+ for (int i = 0; i < headArray.length; i++) {
+ Cell titleCell = titleRow.createCell(i);
+ titleCell.setCellStyle(headStyle);
+ titleCell.setCellValue(title);
+ }
+ sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 0, headArray.length - 1));
+ rowNum++;
+ }
+
+ // 设置页头内容（标题下面的一排小文字信息）
+ if (pageHeadArray != null && pageHeadArray.length > 0) {
+ CellStyle pageHeadStyle = getCellStyle(workbook, "", (short) 9, false, HorizontalAlignment.LEFT,
+ VerticalAlignment.CENTER, false);
+ pageHeadStyle.setBorderTop(BorderStyle.NONE);
+ pageHeadStyle.setBorderBottom(BorderStyle.NONE);
+ pageHeadStyle.setBorderLeft(BorderStyle.NONE);
+ pageHeadStyle.setBorderRight(BorderStyle.NONE);
+ for (int i = 0; i < pageHeadArray.length; i++) {
+ Row headRow = sheet.createRow(rowNum); // 表头行
+ headRow.setHeight((short) 0x150); // 表头行高
+ for (int j = 0; j < headArray.length; j++) {
+ Cell titleCell = headRow.createCell(j);
+ titleCell.setCellStyle(pageHeadStyle);
+ titleCell.setCellValue(pageHeadArray[i]);
+ }
+ sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 0, headArray.length - 1));
+ rowNum++;
+ }
+ }
+
+ // 设置表头内容
+ Row headRow = sheet.createRow(rowNum); // 表头行
+ headRow.setHeight((short) 0x200); // 表头行高
+ for (int i = 0; i < headArray.length; i++) {
+ Cell cell = headRow.createCell(i);
+ cell.setCellValue(headArray[i]);
+ cell.setCellStyle(headStyle);
+ if (sheetTitle != null && headArray.length == 1) {// 只有一列
+ sheet.setColumnWidth(i, sheetTitle.get(k).getBytes().length * 3 * 256);
+ } else {
+ if (null == columnWidthArray) {
+ sheet.setColumnWidth(i, headArray[i].getBytes().length * 2 * 256);
+ } else {
+ sheet.setColumnWidth(i, columnWidthArray.get(headArray[i]) * 256);
+ }
+ }
+
+ }
+ rowNum++;
+
+ for (int i = 0; i < currentData.size(); i++) {
+ Row textRow = sheet.createRow(rowNum);
+ Map<String, String> map = currentData.get(i);
+ int j = 0, maxTextHeight = (short) 0X170;// 0X250; //
+ // 默认行高，可以放2行数据
+ for (String s : map.keySet()) {
+ Object val = map.get(s);
+ if (val == null) {
+ val = "";
+ }
+
+ Cell cell = textRow.createCell(j);
+ cell.setCellValue(String.valueOf(val));
+ cell.setCellStyle(textStyleCenter);
+
+ // 计算最大的高度值
+ // int len = String.valueOf(val).getBytes().length;
+ // if (len > columnWidthArray[j] + 1) {
+ // int tempHeight = (len / (columnWidthArray[j] - 1)
+ // + 1) * 0X125; // 加入了边框，所以一行放入的字节数会少一个
+ // if (tempHeight > maxTextHeight)
+ // maxTextHeight = tempHeight;
+ // }
+ j++;
+ }
+ // 设置行高
+ textRow.setHeight((short) maxTextHeight);
+ rowNum++;
+ }
+
+ // 设置页脚内容
+ if (pageFooterArray != null && pageFooterArray.length > 0) {
+ CellStyle pageFooterStyle = getCellStyle(workbook, "", (short) 9, false,
+ HorizontalAlignment.CENTER, VerticalAlignment.CENTER, false);
+ pageFooterStyle.setBorderTop(BorderStyle.NONE);
+ for (int i = 0; i < pageFooterArray.length; i++) {
+ Row footerRow = sheet.createRow(rowNum); // 表头行
+ footerRow.setHeight((short) 0x180); // 表头行高
+ for (int j = 0; j < headArray.length; j++) {
+ Cell titleCell = footerRow.createCell(j);
+ titleCell.setCellStyle(pageFooterStyle);
+ titleCell.setCellValue(pageFooterArray[i]);
+ }
+ sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 0, headArray.length - 1));
+ rowNum++;
+ }
+ }
+
+ }
+
+ fileOutputStream = response.getOutputStream();
+
+ workbook.write(fileOutputStream);
+ } catch (IOException e) {
+ System.out.println(e.getMessage());
+ return false;
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ return false;
+ } finally {
+ if (null != fileOutputStream) {
+ try {
+ fileOutputStream.close();
+ } catch (IOException e) {
+ System.out.println(e.getMessage());
+ }
+ }
+ }
+ result = true;
+ }
+ return result;
+ }
+
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
index 1bad555..829b8d8 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
@@ -109,4 +109,8 @@
throw new FebsException(message);
}
}
+ @GetMapping("getAllDicitemsAll")
+ public List<DicItem> getAllDicitemsAll() {
+ return dicitemService.getAllDicitemsAll();
+ }
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/DicMapper.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/DicMapper.java
index 2d6fe00..ab855d7 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/DicMapper.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/mapper/DicMapper.java
@@ -8,35 +8,34 @@
import java.util.List;
/**
-*
-* name:Dic
-* package:cc.mrbird.febs.server.system.controller
-* description:数据字典实体Mapper
-*
-* @author luoyibo
-* @date 2021-02-02 11:29:33
-* @since JDK1.8
-*/
+ * name:Dic
+ * package:cc.mrbird.febs.server.system.controller
+ * description:数据字典实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-02-02 11:29:33
+ * @since JDK1.8
+ */
public interface DicMapper extends BaseMapper<Dic> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-02-02 11:29:33
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_dic SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = , \n" +
- " version = version+1 \n" +
- " WHERE badId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
-}
\ No newline at end of file
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-02-02 11:29:33
+ */
+ @Update("<script> " +
+ " UPDATE t_dic SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = , \n" +
+ " version = version+1 \n" +
+ " WHERE badId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IDicItemService.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IDicItemService.java
index 6fb37f6..d11fbc2 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IDicItemService.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IDicItemService.java
@@ -67,4 +67,6 @@
void logicDelDicItem(String ids);
void setDicItemRedis();
+
+ List<DicItem> getAllDicitemsAll();
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
index c63c8ce..ce5f608 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicItemServiceImpl.java
@@ -123,4 +123,11 @@
redisService.del("dicItems");
redisService.set("dicItems", dicItems);
}
-}
\ No newline at end of file
+
+ @Override
+ public List<DicItem> getAllDicitemsAll() {
+ LambdaQueryWrapper<DicItem> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(DicItem::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
+}
--
Gitblit v1.8.0