From 46a7bda364c481e1b7ae3af10f8b25c968868f4a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 二月 2021 00:48:55 +0800
Subject: [PATCH] feat(人力微服务): 信息录入
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java | 81
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java | 145 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java | 21
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpUnemploymentMapper.java | 71
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 23
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpInsuranceMapper.java | 71
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java | 144 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/configure/P6spySqlFormatConfigure.java | 21
febs-server/febs-server-hr/src/main/resources/spy.properties | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccidentCasesMapper.java | 81
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 35
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java | 17
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOccupationalMapper.java | 71
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpPhysicalExamMapper.java | 22
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java | 144 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 35
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpResignMapper.java | 71
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java | 144 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java | 71
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.java | 71
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java | 114 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.java | 71
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java | 12
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java | 19
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionAttendMapper.java | 71
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java | 81
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java | 125 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 11
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java | 114 +
59 files changed, 1,992 insertions(+), 1,269 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/configure/P6spySqlFormatConfigure.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/configure/P6spySqlFormatConfigure.java
new file mode 100644
index 0000000..e1054d0
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/configure/P6spySqlFormatConfigure.java
@@ -0,0 +1,21 @@
+package cc.mrbird.febs.server.hr.configure;
+
+import cc.mrbird.febs.common.core.utils.DateUtil;
+import com.p6spy.engine.spy.appender.MessageFormattingStrategy;
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.LocalDateTime;
+
+/**
+ * 自定义 p6spy sql输出格式
+ *
+ * @author MrBird
+ */
+public class P6spySqlFormatConfigure implements MessageFormattingStrategy {
+
+ @Override
+ public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) {
+ return StringUtils.isNotBlank(sql) ? DateUtil.formatFullTime(LocalDateTime.now(), DateUtil.FULL_TIME_SPLIT_PATTERN)
+ + " | 耗时 " + elapsed + " ms | SQL 语句：" + StringUtils.LF + sql.replaceAll("[\\s]+", StringUtils.SPACE) + ";" : StringUtils.EMPTY;
+ }
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
index 3ae6d93..b935cdd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -77,7 +79,7 @@
@PreAuthorize("hasAuthority('empAccidentcases:delete')")
public void logicDeleteEmpAccidentCases(@PathVariable("ids") String ids) throws FebsException {
try {
-this.empAccidentCasesService.logicDelEmpAccidentcases(ids);
+this.empAccidentCasesService.logicDelEmpAccidentCases(ids);
} catch (Exception e) {
String message = "逻辑删除员工意外险案件失败";
log.error(message, e);
@@ -96,4 +98,17 @@
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "意外险案件信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empAccidentcases:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empAccidentCasesService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "意外险案件信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
index 2ec6600..305fff2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -96,4 +98,17 @@
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "不良记录信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empBadrecord:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empBadrecordService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "不良记录信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
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 57681d5..430a036 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -1,7 +1,5 @@
package cc.mrbird.febs.server.hr.controller;
-import cc.mrbird.febs.common.core.entity.system.Dept;
-import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
@@ -19,7 +17,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
-import java.util.List;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -61,7 +59,11 @@
@PostMapping
@PreAuthorize("hasAuthority('empBaseinfo:add')")
public void addEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
+ if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
+ throw new FebsException("已存在此员工编号");
+ }
try {
+ //EmpBaseInfo tempInfo = this.empBaseInfoService.
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
String message = "新增员工基本信息失败";
@@ -86,7 +88,7 @@
@ApiOperation(value = "人员基本信息逻辑删除")
@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empBaseinfo:delete')")
- public void logicDeleteEmpBaseInfo(@PathVariable("ids") String ids) throws FebsException {
+ public void logicDeleteEmpBaseInfo(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empBaseInfoService.logicDelEmpBaseInfo(ids);
} catch (Exception e) {
@@ -99,7 +101,10 @@
@ApiOperation(value = "人员基本信息修改")
@PutMapping
@PreAuthorize("hasAuthority('empBaseinfo:update')")
- public void updateEmpBaseInfo(EmpBaseInfo empBaseinfo) throws FebsException {
+ public void updateEmpBaseInfo(@Valid EmpBaseInfo empBaseinfo) throws FebsException {
+ if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
+ throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
+ }
try {
this.empBaseInfoService.updateEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
@@ -108,13 +113,17 @@
throw new FebsException(message);
}
}
+ @ApiOperation(value = "基本信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empBaseinfo:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empBaseInfoService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "基本信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
- // @GetMapping("user/list")
- // public FebsResponse getRemoteUserList(QueryRequest request, SystemUser user) {
- // return remoteUserService.userList(request, user);
- // }
- // @GetMapping("dept/list")
- // public List<Dept> getRemoteDeptList(Dept dept) {
- // return remoteDeptService.selectAllDept(dept);
- // }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
index 6c40472..4626a43 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -96,4 +98,17 @@
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "合同信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empContractinfo:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empContractinfoService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "合同信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
index 9b0a489..bbee976 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -96,4 +98,17 @@
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "离职当月考勤信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empDimissionattend:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empDimissionattendService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "离职当月考勤信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
index 18bd838..d1f7de8 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -96,4 +98,17 @@
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "社保申请信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empInsurance:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empInsuranceService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "社保申请信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
index 988f79c..c0610c2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -96,4 +98,17 @@
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "劳资案件信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empLabortrouble:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empLabortroubleService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "劳资信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
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 a7c3e9e..49faf24 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
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -39,13 +41,13 @@
@GetMapping
@PreAuthorize("hasAuthority('empLeaveinfo:list')")
public FebsResponse getAllEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
-return new FebsResponse().data(empLeaveinfoService.findEmpLeaveinfos(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));
+Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLeaveinfoService.findEmpLeaveInfos(request, empLeaveinfo));
return new FebsResponse().data(dataTable);
}
@@ -96,4 +98,17 @@
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 {
+ try {
+ this.empLeaveinfoService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "请假申请信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
index 50e6c91..5cd2e54 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,18 +15,18 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
-*
-* name:EmpOccupational
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工伤案件控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:32
-* @since JDK1.8
-*/
+ * name:EmpOccupational
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工伤案件控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:32
+ * @since JDK1.8
+ */
@Api(tags = "人员工伤信息录入接口")
@Slf4j
@Validated
@@ -34,66 +35,79 @@
@RequiredArgsConstructor
public class EmpOccupationalController {
-private final IEmpOccupationalService empOccupationalService;
+ private final IEmpOccupationalService empOccupationalService;
-@GetMapping
-@PreAuthorize("hasAuthority('empOccupational:list')")
-public FebsResponse getAllEmpOccupationals(EmpOccupational empOccupational) {
-return new FebsResponse().data(empOccupationalService.findEmpOccupationals(empOccupational));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empOccupational:list')")
+ public FebsResponse getAllEmpOccupationals(EmpOccupational empOccupational) {
+ return new FebsResponse().data(empOccupationalService.findEmpOccupationals(empOccupational));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empOccupational:list')")
-public FebsResponse empOccupationalList(QueryRequest request, EmpOccupational empOccupational) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empOccupationalService.findEmpOccupationals(request, empOccupational));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empOccupational:list')")
+ public FebsResponse empOccupationalList(QueryRequest request, EmpOccupational empOccupational) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empOccupationalService.findEmpOccupationals(request, empOccupational));
+ return new FebsResponse().data(dataTable);
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empOccupational:add')")
-public void addEmpOccupational(@Valid EmpOccupational empOccupational) throws FebsException {
-try {
-this.empOccupationalService.createEmpOccupational(empOccupational);
-} catch (Exception e) {
-String message = "新增员工工伤案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empOccupational:add')")
+ public void addEmpOccupational(@Valid EmpOccupational empOccupational) throws FebsException {
+ try {
+ this.empOccupationalService.createEmpOccupational(empOccupational);
+ } catch (Exception e) {
+ String message = "新增员工工伤案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empOccupational:delete')")
-public void deleteEmpOccupational(EmpOccupational empOccupational) throws FebsException {
-try {
-this.empOccupationalService.deleteEmpOccupational(empOccupational);
-} catch (Exception e) {
-String message = "删除员工工伤案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empOccupational:delete')")
+ public void deleteEmpOccupational(EmpOccupational empOccupational) throws FebsException {
+ try {
+ this.empOccupationalService.deleteEmpOccupational(empOccupational);
+ } catch (Exception e) {
+ String message = "删除员工工伤案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empOccupational:delete')")
-public void logicDeleteEmpOccupational(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empOccupationalService.logicDelEmpOccupational(ids);
-} catch (Exception e) {
-String message = "逻辑删除员工工伤案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empOccupational:delete')")
+ public void logicDeleteEmpOccupational(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empOccupationalService.logicDelEmpOccupational(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除员工工伤案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empOccupational:update')")
-public void updateEmpOccupational(EmpOccupational empOccupational) throws FebsException {
-try {
-this.empOccupationalService.updateEmpOccupational(empOccupational);
-} catch (Exception e) {
-String message = "修改员工工伤案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PutMapping
+ @PreAuthorize("hasAuthority('empOccupational:update')")
+ public void updateEmpOccupational(EmpOccupational empOccupational) throws FebsException {
+ try {
+ this.empOccupationalService.updateEmpOccupational(empOccupational);
+ } catch (Exception e) {
+ String message = "修改员工工伤案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @ApiOperation(value = "工伤案件信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empOccupational:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empOccupationalService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "工伤案件信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
index 6941aea..f262cbb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpPhysicalExamController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -95,4 +97,17 @@
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "体检信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empPhysicalexam:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empPhysicalExamService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "体检信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
index 5fca2c2..9bfdc73 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,18 +15,18 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
-*
-* name:EmpRemarkinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工备注信息控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:48
-* @since JDK1.8
-*/
+ * name:EmpRemarkinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工备注信息控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:48
+ * @since JDK1.8
+ */
@Api(tags = "人员备注信息录入接口")
@Slf4j
@Validated
@@ -34,66 +35,80 @@
@RequiredArgsConstructor
public class EmpRemarkInfoController {
-private final IEmpRemarkinfoService empRemarkinfoService;
+ private final IEmpRemarkinfoService empRemarkinfoService;
-@GetMapping
-@PreAuthorize("hasAuthority('empRemarkinfo:list')")
-public FebsResponse getAllEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
-return new FebsResponse().data(empRemarkinfoService.findEmpRemarkinfos(empRemarkinfo));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empRemarkinfo:list')")
+ public FebsResponse getAllEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
+ return new FebsResponse().data(empRemarkinfoService.findEmpRemarkinfos(empRemarkinfo));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empRemarkinfo:list')")
-public FebsResponse empRemarkinfoList(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empRemarkinfoService.findEmpRemarkinfos(request, empRemarkinfo));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empRemarkinfo:list')")
+ public FebsResponse empRemarkinfoList(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empRemarkinfoService.findEmpRemarkinfos(request, empRemarkinfo));
+ return new FebsResponse().data(dataTable);
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empRemarkinfo:add')")
-public void addEmpRemarkinfo(@Valid EmpRemarkInfo empRemarkinfo) throws FebsException {
-try {
-this.empRemarkinfoService.createEmpRemarkinfo(empRemarkinfo);
-} catch (Exception e) {
-String message = "新增员工备注信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empRemarkinfo:add')")
+ public void addEmpRemarkinfo(@Valid EmpRemarkInfo empRemarkinfo) throws FebsException {
+ try {
+ this.empRemarkinfoService.createEmpRemarkinfo(empRemarkinfo);
+ } catch (Exception e) {
+ String message = "新增员工备注信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empRemarkinfo:delete')")
-public void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) throws FebsException {
-try {
-this.empRemarkinfoService.deleteEmpRemarkinfo(empRemarkinfo);
-} catch (Exception e) {
-String message = "删除员工备注信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empRemarkinfo:delete')")
+ public void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) throws FebsException {
+ try {
+ this.empRemarkinfoService.deleteEmpRemarkinfo(empRemarkinfo);
+ } catch (Exception e) {
+ String message = "删除员工备注信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empRemarkinfo:delete')")
-public void logicDeleteEmpRemarkinfo(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empRemarkinfoService.logicDelEmpRemarkinfo(ids);
-} catch (Exception e) {
-String message = "逻辑删除员工备注信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empRemarkinfo:delete')")
+ public void logicDeleteEmpRemarkinfo(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empRemarkinfoService.logicDelEmpRemarkinfo(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除员工备注信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empRemarkinfo:update')")
-public void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) throws FebsException {
-try {
-this.empRemarkinfoService.updateEmpRemarkinfo(empRemarkinfo);
-} catch (Exception e) {
-String message = "修改员工备注信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PutMapping
+ @PreAuthorize("hasAuthority('empRemarkinfo:update')")
+ public void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) throws FebsException {
+ try {
+ this.empRemarkinfoService.updateEmpRemarkinfo(empRemarkinfo);
+ } catch (Exception e) {
+ String message = "修改员工备注信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @ApiOperation(value = "备注信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empRemarkinfo:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empRemarkinfoService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "备注信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
index 8a5bdb1..318fa65 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,18 +15,18 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
-*
-* name:EmpResign
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工辞职申请控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:18
-* @since JDK1.8
-*/
+ * name:EmpResign
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工辞职申请控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:18
+ * @since JDK1.8
+ */
@Api(tags = "人员辞职申请信息录入接口")
@Slf4j
@Validated
@@ -34,66 +35,79 @@
@RequiredArgsConstructor
public class EmpResignController {
-private final IEmpResignService empResignService;
+ private final IEmpResignService empResignService;
-@GetMapping
-@PreAuthorize("hasAuthority('empResign:list')")
-public FebsResponse getAllEmpResigns(EmpResign empResign) {
-return new FebsResponse().data(empResignService.findEmpResigns(empResign));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empResign:list')")
+ public FebsResponse getAllEmpResigns(EmpResign empResign) {
+ return new FebsResponse().data(empResignService.findEmpResigns(empResign));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empResign:list')")
-public FebsResponse empResignList(QueryRequest request, EmpResign empResign) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empResignService.findEmpResigns(request, empResign));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empResign:list')")
+ public FebsResponse empResignList(QueryRequest request, EmpResign empResign) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empResignService.findEmpResigns(request, empResign));
+ return new FebsResponse().data(dataTable);
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empResign:add')")
-public void addEmpResign(@Valid EmpResign empResign) throws FebsException {
-try {
-this.empResignService.createEmpResign(empResign);
-} catch (Exception e) {
-String message = "新增员工辞职申请失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empResign:add')")
+ public void addEmpResign(@Valid EmpResign empResign) throws FebsException {
+ try {
+ this.empResignService.createEmpResign(empResign);
+ } catch (Exception e) {
+ String message = "新增员工辞职申请失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empResign:delete')")
-public void deleteEmpResign(EmpResign empResign) throws FebsException {
-try {
-this.empResignService.deleteEmpResign(empResign);
-} catch (Exception e) {
-String message = "删除员工辞职申请失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empResign:delete')")
+ public void deleteEmpResign(EmpResign empResign) throws FebsException {
+ try {
+ this.empResignService.deleteEmpResign(empResign);
+ } catch (Exception e) {
+ String message = "删除员工辞职申请失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empResign:delete')")
-public void logicDeleteEmpResign(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empResignService.logicDelEmpResign(ids);
-} catch (Exception e) {
-String message = "逻辑删除员工辞职申请失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empResign:delete')")
+ public void logicDeleteEmpResign(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empResignService.logicDelEmpResign(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除员工辞职申请失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empResign:update')")
-public void updateEmpResign(EmpResign empResign) throws FebsException {
-try {
-this.empResignService.updateEmpResign(empResign);
-} catch (Exception e) {
-String message = "修改员工辞职申请失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PutMapping
+ @PreAuthorize("hasAuthority('empResign:update')")
+ public void updateEmpResign(EmpResign empResign) throws FebsException {
+ try {
+ this.empResignService.updateEmpResign(empResign);
+ } catch (Exception e) {
+ String message = "修改员工辞职申请失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @ApiOperation(value = "辞职申请信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empResign:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empResignService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "辞职申请信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
index bdc7bf6..12cc8b5 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpUnemploymentController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,18 +15,18 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
-*
-* name:EmpUnemployment
-* package:cc.mrbird.febs.server.hr.controller
-* description:失业金领取表控制器
-*
-* @author luoyibo
-* @date 2021-02-01 00:22:28
-* @since JDK1.8
-*/
+ * name:EmpUnemployment
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:失业金领取表控制器
+ *
+ * @author luoyibo
+ * @date 2021-02-01 00:22:28
+ * @since JDK1.8
+ */
@Api(tags = "人员失业金领取信息录入接口")
@Slf4j
@Validated
@@ -34,66 +35,79 @@
@RequiredArgsConstructor
public class EmpUnemploymentController {
-private final IEmpUnemploymentService empUnemploymentService;
+ private final IEmpUnemploymentService empUnemploymentService;
-@GetMapping
-@PreAuthorize("hasAuthority('empUnemployment:list')")
-public FebsResponse getAllEmpUnemployments(EmpUnemployment empUnemployment) {
-return new FebsResponse().data(empUnemploymentService.findEmpUnemployments(empUnemployment));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empUnemployment:list')")
+ public FebsResponse getAllEmpUnemployments(EmpUnemployment empUnemployment) {
+ return new FebsResponse().data(empUnemploymentService.findEmpUnemployments(empUnemployment));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empUnemployment:list')")
-public FebsResponse empUnemploymentList(QueryRequest request, EmpUnemployment empUnemployment) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empUnemploymentService.findEmpUnemployments(request, empUnemployment));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empUnemployment:list')")
+ public FebsResponse empUnemploymentList(QueryRequest request, EmpUnemployment empUnemployment) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empUnemploymentService.findEmpUnemployments(request, empUnemployment));
+ return new FebsResponse().data(dataTable);
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empUnemployment:add')")
-public void addEmpUnemployment(@Valid EmpUnemployment empUnemployment) throws FebsException {
-try {
-this.empUnemploymentService.createEmpUnemployment(empUnemployment);
-} catch (Exception e) {
-String message = "新增失业金领取表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empUnemployment:add')")
+ public void addEmpUnemployment(@Valid EmpUnemployment empUnemployment) throws FebsException {
+ try {
+ this.empUnemploymentService.createEmpUnemployment(empUnemployment);
+ } catch (Exception e) {
+ String message = "新增失业金领取表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empUnemployment:delete')")
-public void deleteEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
-try {
-this.empUnemploymentService.deleteEmpUnemployment(empUnemployment);
-} catch (Exception e) {
-String message = "删除失业金领取表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empUnemployment:delete')")
+ public void deleteEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ try {
+ this.empUnemploymentService.deleteEmpUnemployment(empUnemployment);
+ } catch (Exception e) {
+ String message = "删除失业金领取表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empUnemployment:delete')")
-public void logicDeleteEmpUnemployment(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empUnemploymentService.logicDelEmpUnemployment(ids);
-} catch (Exception e) {
-String message = "逻辑删除失业金领取表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empUnemployment:delete')")
+ public void logicDeleteEmpUnemployment(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empUnemploymentService.logicDelEmpUnemployment(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除失业金领取表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empUnemployment:update')")
-public void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
-try {
-this.empUnemploymentService.updateEmpUnemployment(empUnemployment);
-} catch (Exception e) {
-String message = "修改失业金领取表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PutMapping
+ @PreAuthorize("hasAuthority('empUnemployment:update')")
+ public void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ try {
+ this.empUnemploymentService.updateEmpUnemployment(empUnemployment);
+ } catch (Exception e) {
+ String message = "修改失业金领取表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @ApiOperation(value = "失业金领取信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empUnemployment:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empUnemploymentService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "失业金领取信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
index 89fe523..5daa8d3 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpWorkExperienceController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
@@ -95,4 +97,17 @@
throw new FebsException(message);
}
}
+
+ @ApiOperation(value = "工作简历信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empWorkexperience:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empWorkExperienceService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "工作简历信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
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 f0f7f9c..ec57073 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
@@ -17,6 +17,8 @@
import com.baomidou.mybatisplus.annotation.Version;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+
/**
* name:EmpBaseinfo
* package:cc.mrbird.febs.server.hr.controller
@@ -50,14 +52,17 @@
@TableField(exist = false)
private String deptName = "";
+ @NotBlank(message = "{required}")
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
private String empNumb = "";
+ @NotBlank(message = "{required}")
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
private String empName = "";
+ @NotBlank(message = "{required}")
@FieldInfo(name = "sex", type = "varchar", explain = "性别")
@TableField("sex")
private String sex = "";
@@ -74,9 +79,14 @@
@TableField("jobName")
private String jobName = "";
- @FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类另字典表")
+ @NotBlank(message = "{required}")
+ @FieldInfo(name = "empType", type = "varchar", explain = "员工类别,员工类别字典表")
@TableField("empType")
private String empType = "";
+
+ @FieldInfo(name = "empTypeName", type = "varchar", explain = "员工类别,员工类别字典表")
+ @TableField(exist = false)
+ private String empTypeName = "";
@FieldInfo(name = "certificateType", type = "varchar", explain = "证件类型,人员证件类型，国标代码")
@TableField("certificateType")
@@ -187,6 +197,10 @@
@TableField("archivesStatus")
private String archivesStatus = "";
+ @FieldInfo(name = "archivesStatusName", type = "varchar", explain = "档案情况")
+ @TableField(exist = false)
+ private String archivesStatusName = "";
+
@FieldInfo(name = "bankName", type = "varchar", explain = "银行名称")
@TableField("bankName")
private String bankName = "";
@@ -198,6 +212,10 @@
@FieldInfo(name = "InsuranceType", type = "varchar", explain = "保险类型")
@TableField("InsuranceType")
private String insuranceType = "";
+
+ @FieldInfo(name = "InsuranceTypeName", type = "varchar", explain = "保险类型")
+ @TableField(exist = false)
+ private String insuranceTypeName = "";
@FieldInfo(name = "socialNumb", type = "varchar", explain = "社保电脑号")
@TableField("socialNumb")
@@ -227,7 +245,6 @@
@TableField(exist = false)
private String certificateListName = "";
-
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@@ -250,7 +267,7 @@
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @FieldInfo(name = "delFlag", type = "int", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccidentCasesMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccidentCasesMapper.java
index c1bf82d..6c9eb10 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccidentCasesMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccidentCasesMapper.java
@@ -8,35 +8,56 @@
import java.util.List;
/**
-*
-* name:EmpAccidentcases
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工意外险案件实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:27
-* @since JDK1.8
-*/
+ * name:EmpAccidentcases
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工意外险案件实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:27
+ * @since JDK1.8
+ */
public interface EmpAccidentCasesMapper extends BaseMapper<EmpAccidentCases> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:27
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_accidentcases SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE accidentId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId}\n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:27
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_accidentcases SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE accidentId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId}\n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ /**
+ * 暂存记录提交
+ * <p>
+ * date 2021-02-04 23:04
+ *
+ * @param list 暂存记录标识列表
+ * @param operatorId 操作员Id
+ * @return int
+ * @author: luoyibo
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_accidentcases SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE accidentId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId}\n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java
index 15a02a4..1f651a9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java
@@ -8,35 +8,56 @@
import java.util.List;
/**
-*
-* name:EmpBadrecord
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工不良记录信息实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:42
-* @since JDK1.8
-*/
+ * name:EmpBadrecord
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工不良记录信息实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:42
+ * @since JDK1.8
+ */
public interface EmpBadRecordMapper extends BaseMapper<EmpBadRecord> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:42
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_badrecord SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE badId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:42
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_badrecord SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE badId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ /**
+ * 暂存记录提交
+ * <p>
+ * date luoyibo
+ *
+ * @param list 暂存记录Id列表
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:42
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_badrecord SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE badId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
index ee67fa0..12deba4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
@@ -8,35 +8,56 @@
import java.util.List;
/**
-*
-* name:EmpBaseinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-30 08:04:50
-* @since JDK1.8
-*/
+ * name:EmpBaseinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-30 08:04:50
+ * @since JDK1.8
+ */
public interface EmpBaseInfoMapper extends BaseMapper<EmpBaseInfo> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-30 08:04:50
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_baseinfo SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE empId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-30 08:04:50
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_baseinfo SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE empId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ /**
+ * 将记录从暂存状态转为正常状态
+ * <p>
+ * date 2021-02-04 21:28
+ *
+ * @param list 待转换记录标识
+ * @param operatorId 操作员
+ * @return int
+ * @author: luoyibo
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_baseinfo SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE empId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
index a035d5f..4c1e12e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java
@@ -39,4 +39,25 @@
" </foreach>\n" +
"</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ *
+ * 暂存记录提交
+ *
+ * date luoyibo
+ * @author: 2021-01-31 11:28:23
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_contractinfo SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE contractId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionAttendMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionAttendMapper.java
index d00356e..72d2f3b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionAttendMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionAttendMapper.java
@@ -8,35 +8,46 @@
import java.util.List;
/**
-*
-* name:EmpDimissionattend
-* package:cc.mrbird.febs.server.hr.controller
-* description:离职当月考勤实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:04
-* @since JDK1.8
-*/
+ * name:EmpDimissionattend
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:离职当月考勤实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:04
+ * @since JDK1.8
+ */
public interface EmpDimissionAttendMapper extends BaseMapper<EmpDimissionAttend> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:04
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_dimissionattend SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE dimissionAttendId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:04
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_dimissionattend SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE dimissionAttendId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_dimissionattend SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE dimissionAttendId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpInsuranceMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpInsuranceMapper.java
index 2fd08ae..0560623 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpInsuranceMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpInsuranceMapper.java
@@ -8,35 +8,46 @@
import java.util.List;
/**
-*
-* name:EmpInsurance
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工社保申请实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:23
-* @since JDK1.8
-*/
+ * name:EmpInsurance
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工社保申请实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:23
+ * @since JDK1.8
+ */
public interface EmpInsuranceMapper extends BaseMapper<EmpInsurance> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:23
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_insurance SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE insuranceId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:23
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_insurance SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE insuranceId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_insurance SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE insuranceId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.java
index 1e951da..aa7649c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.java
@@ -8,35 +8,46 @@
import java.util.List;
/**
-*
-* name:EmpLabortrouble
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工劳资案件实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:36
-* @since JDK1.8
-*/
+ * name:EmpLabortrouble
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工劳资案件实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:36
+ * @since JDK1.8
+ */
public interface EmpLaborTroubleMapper extends BaseMapper<EmpLaborTrouble> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:36
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_labortrouble SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE arbitrationId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:36
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_labortrouble SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE arbitrationId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_labortrouble SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE arbitrationId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java
index d5cfb9e..a34c147 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java
@@ -8,35 +8,46 @@
import java.util.List;
/**
-*
-* name:EmpLeaveinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工请假记录实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:13
-* @since JDK1.8
-*/
+ * name:EmpLeaveinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工请假记录实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:13
+ * @since JDK1.8
+ */
public interface EmpLeaveInfoMapper extends BaseMapper<EmpLeaveInfo> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:13
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_leaveinfo SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE leaveId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:13
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_leaveinfo SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE leaveId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_leaveinfo SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE leaveId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOccupationalMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOccupationalMapper.java
index f79ec94..d8f6e25 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOccupationalMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOccupationalMapper.java
@@ -8,35 +8,46 @@
import java.util.List;
/**
-*
-* name:EmpOccupational
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工伤案件实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:32
-* @since JDK1.8
-*/
+ * name:EmpOccupational
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工伤案件实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:32
+ * @since JDK1.8
+ */
public interface EmpOccupationalMapper extends BaseMapper<EmpOccupational> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:32
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_occupational SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE occupationalId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:32
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_occupational SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE occupationalId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_occupational SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE occupationalId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpPhysicalExamMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpPhysicalExamMapper.java
index 4538088..754c2fa 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpPhysicalExamMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpPhysicalExamMapper.java
@@ -38,4 +38,26 @@
" </foreach>\n" +
"</script>")
void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 09:11:00
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_physicalexam SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE physicalExamId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.java
index 2cef382..fbadbfe 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.java
@@ -8,35 +8,46 @@
import java.util.List;
/**
-*
-* name:EmpRemarkinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工备注信息实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:48
-* @since JDK1.8
-*/
+ * name:EmpRemarkinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工备注信息实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:48
+ * @since JDK1.8
+ */
public interface EmpRemarkInfoMapper extends BaseMapper<EmpRemarkInfo> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:48
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_remarkinfo SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE remarkId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:48
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_remarkinfo SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE remarkId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_remarkinfo SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE remarkId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpResignMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpResignMapper.java
index 5015127..b97c7ec 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpResignMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpResignMapper.java
@@ -8,35 +8,46 @@
import java.util.List;
/**
-*
-* name:EmpResign
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工辞职申请实体Mapper
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:18
-* @since JDK1.8
-*/
+ * name:EmpResign
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工辞职申请实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:18
+ * @since JDK1.8
+ */
public interface EmpResignMapper extends BaseMapper<EmpResign> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-01-31 11:26:18
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_resign SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE resignId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId} \n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-01-31 11:26:18
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_resign SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE resignId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_resign SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE resignId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId} \n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpUnemploymentMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpUnemploymentMapper.java
index bfb7a17..fbc6e7b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpUnemploymentMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpUnemploymentMapper.java
@@ -8,35 +8,46 @@
import java.util.List;
/**
-*
-* name:EmpUnemployment
-* package:cc.mrbird.febs.server.hr.controller
-* description:失业金领取表实体Mapper
-*
-* @author luoyibo
-* @date 2021-02-01 00:22:28
-* @since JDK1.8
-*/
+ * name:EmpUnemployment
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:失业金领取表实体Mapper
+ *
+ * @author luoyibo
+ * @date 2021-02-01 00:22:28
+ * @since JDK1.8
+ */
public interface EmpUnemploymentMapper extends BaseMapper<EmpUnemployment> {
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date luoyibo
-* @author: 2021-02-01 00:22:28
-* @param list 待删除Id
-* @param operatorId 操作员Id
-* @return void
-*/
-@Update("<script> " +
- " UPDATE t_emp_unemployment SET delFlag = 1,\n" +
- " modifyTime = NOW(),\n" +
- " modifier = #{operatorId}, \n" +
- " version = version+1 \n" +
- " WHERE unemploymentId IN \n" +
- " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
- " #{delId}\n" +
- " </foreach>\n" +
- "</script>")
-void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date luoyibo
+ *
+ * @param list 待删除Id
+ * @param operatorId 操作员Id
+ * @return void
+ * @author: 2021-02-01 00:22:28
+ */
+ @Update("<script> " +
+ " UPDATE t_emp_unemployment SET delFlag = 1,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE unemploymentId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId}\n" +
+ " </foreach>\n" +
+ "</script>")
+ void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_unemployment SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE unemploymentId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId}\n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
index 76b7933..e2f100c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.java
@@ -38,4 +38,16 @@
" </foreach>\n" +
"</script>")
void logicDeleteByIds(@Param("list") List<String> list, @Param("operatorId") String operatorId);
+
+ @Update("<script> " +
+ " UPDATE t_emp_workExperience SET delFlag = 0,\n" +
+ " modifyTime = NOW(),\n" +
+ " modifier = #{operatorId}, \n" +
+ " version = version+1 \n" +
+ " WHERE workExperienceId IN \n" +
+ " <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
+ " #{delId}\n" +
+ " </foreach>\n" +
+ "</script>")
+ int momentToNormal(@Param("list") List<String> list, @Param("operatorId") String operatorId);
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java
index 857fb39..981b130 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpAccidentcases
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工意外险案件服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:27
-* @since JDK1.8
-*/
+ * name:EmpAccidentcases
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工意外险案件服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:27
+ * @since JDK1.8
+ */
public interface IEmpAccidentCasesService extends IService<EmpAccidentCases> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empAccidentcases empAccidentcases
-* @return IPage<EmpAccidentcases>
-*/
-IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empAccidentcases empAccidentcases
+ * @return IPage<EmpAccidentcases>
+ */
+ IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases);
-/**
-* 查询（所有）
-*
-* @param empAccidentcases empAccidentcases
-* @return List<EmpAccidentcases>
-*/
-List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases);
+ /**
+ * 查询（所有）
+ *
+ * @param empAccidentcases empAccidentcases
+ * @return List<EmpAccidentcases>
+ */
+ List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases);
-/**
-* 新增
-*
-* @param empAccidentcases empAccidentcases
-*/
-void createEmpAccidentcases(EmpAccidentCases empAccidentcases);
+ /**
+ * 新增
+ *
+ * @param empAccidentcases empAccidentcases
+ */
+ void createEmpAccidentcases(EmpAccidentCases empAccidentcases);
-/**
-* 修改
-*
-* @param empAccidentcases empAccidentcases
-*/
-void updateEmpAccidentcases(EmpAccidentCases empAccidentcases);
+ /**
+ * 修改
+ *
+ * @param empAccidentcases empAccidentcases
+ */
+ void updateEmpAccidentcases(EmpAccidentCases empAccidentcases);
-/**
-* 删除
-*
-* @param empAccidentcases empAccidentcases
-*/
-void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases);
+ /**
+ * 删除
+ *
+ * @param empAccidentcases empAccidentcases
+ */
+ void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpAccidentcases(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpAccidentCases(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java
index 0682846..8942369 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpBadrecord
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工不良记录信息服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:42
-* @since JDK1.8
-*/
+ * name:EmpBadrecord
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工不良记录信息服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:42
+ * @since JDK1.8
+ */
public interface IEmpBadRecordService extends IService<EmpBadRecord> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empBadrecord empBadrecord
-* @return IPage<EmpBadrecord>
-*/
-IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empBadrecord empBadrecord
+ * @return IPage<EmpBadrecord>
+ */
+ IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord);
-/**
-* 查询（所有）
-*
-* @param empBadrecord empBadrecord
-* @return List<EmpBadrecord>
-*/
-List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord);
+ /**
+ * 查询（所有）
+ *
+ * @param empBadrecord empBadrecord
+ * @return List<EmpBadrecord>
+ */
+ List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord);
-/**
-* 新增
-*
-* @param empBadrecord empBadrecord
-*/
-void createEmpBadrecord(EmpBadRecord empBadrecord);
+ /**
+ * 新增
+ *
+ * @param empBadrecord empBadrecord
+ */
+ void createEmpBadrecord(EmpBadRecord empBadrecord);
-/**
-* 修改
-*
-* @param empBadrecord empBadrecord
-*/
-void updateEmpBadrecord(EmpBadRecord empBadrecord);
+ /**
+ * 修改
+ *
+ * @param empBadrecord empBadrecord
+ */
+ void updateEmpBadrecord(EmpBadRecord empBadrecord);
-/**
-* 删除
-*
-* @param empBadrecord empBadrecord
-*/
-void deleteEmpBadrecord(EmpBadRecord empBadrecord);
+ /**
+ * 删除
+ *
+ * @param empBadrecord empBadrecord
+ */
+ void deleteEmpBadrecord(EmpBadRecord empBadrecord);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpBadrecord(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpBadrecord(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
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 e23f7ac..4b32ac4 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
@@ -9,62 +9,83 @@
import java.util.List;
/**
-*
-* name:EmpBaseinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:服务接口
-*
-* @author luoyibo
-* @date 2021-01-30 08:04:50
-* @since JDK1.8
-*/
+ * name:EmpBaseinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-30 08:04:50
+ * @since JDK1.8
+ */
public interface IEmpBaseInfoService extends IService<EmpBaseInfo> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empBaseInfo empBaseinfo
-* @return IPage<EmpBaseinfo>
-*/
-IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empBaseInfo empBaseinfo
+ * @return IPage<EmpBaseinfo>
+ */
+ IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo);
-/**
-* 查询（所有）
-*
-* @param empBaseInfo empBaseInfo
-* @return List<EmpBaseinfo>
-*/
-List<EmpBaseInfo> findEmpBaseInfos(EmpBaseInfo empBaseInfo);
+ /**
+ * 查询（所有）
+ *
+ * @param empBaseInfo empBaseInfo
+ * @return List<EmpBaseinfo>
+ */
+ List<EmpBaseInfo> findEmpBaseInfos(EmpBaseInfo empBaseInfo);
-/**
-* 新增
-*
-* @param empBaseInfo empBaseInfo
-*/
-void createEmpBaseInfo(EmpBaseInfo empBaseInfo);
+ /**
+ * 新增
+ *
+ * @param empBaseInfo empBaseInfo
+ */
+ void createEmpBaseInfo(EmpBaseInfo empBaseInfo);
-/**
-* 修改
-*
-* @param empBaseInfo empBaseInfo
-*/
-void updateEmpBaseInfo(EmpBaseInfo empBaseInfo);
+ /**
+ * 修改
+ *
+ * @param empBaseInfo empBaseInfo
+ */
+ void updateEmpBaseInfo(EmpBaseInfo empBaseInfo);
-/**
-* 删除
-*
-* @param empBaseInfo empBaseInfo
-*/
-void deleteEmpBaseInfo(EmpBaseInfo empBaseInfo);
+ /**
+ * 删除
+ *
+ * @param empBaseInfo empBaseInfo
+ */
+ void deleteEmpBaseInfo(EmpBaseInfo empBaseInfo);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpBaseInfo(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpBaseInfo(String ids);
+
+ /**
+ * 人员编号唯一性检查
+ * <p>
+ * date 2021-02-03 22:32
+ *
+ * @param empBaseInfo 人员信息
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean verifyEmpNumb(EmpBaseInfo empBaseInfo);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
index 303de62..437ffa0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpContractinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工合同信息服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:28:23
-* @since JDK1.8
-*/
+ * name:EmpContractinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工合同信息服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:28:23
+ * @since JDK1.8
+ */
public interface IEmpContractInfoService extends IService<EmpContractInfo> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empContractinfo empContractinfo
-* @return IPage<EmpContractinfo>
-*/
-IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empContractinfo empContractinfo
+ * @return IPage<EmpContractinfo>
+ */
+ IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo);
-/**
-* 查询（所有）
-*
-* @param empContractinfo empContractinfo
-* @return List<EmpContractinfo>
-*/
-List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo);
+ /**
+ * 查询（所有）
+ *
+ * @param empContractinfo empContractinfo
+ * @return List<EmpContractinfo>
+ */
+ List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo);
-/**
-* 新增
-*
-* @param empContractinfo empContractinfo
-*/
-void createEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 新增
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void createEmpContractinfo(EmpContractInfo empContractinfo);
-/**
-* 修改
-*
-* @param empContractinfo empContractinfo
-*/
-void updateEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 修改
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void updateEmpContractinfo(EmpContractInfo empContractinfo);
-/**
-* 删除
-*
-* @param empContractinfo empContractinfo
-*/
-void deleteEmpContractinfo(EmpContractInfo empContractinfo);
+ /**
+ * 删除
+ *
+ * @param empContractinfo empContractinfo
+ */
+ void deleteEmpContractinfo(EmpContractInfo empContractinfo);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpContractinfo(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpContractinfo(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java
index 001e225..b966daf 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpDimissionattend
-* package:cc.mrbird.febs.server.hr.controller
-* description:离职当月考勤服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:04
-* @since JDK1.8
-*/
+ * name:EmpDimissionattend
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:离职当月考勤服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:04
+ * @since JDK1.8
+ */
public interface IEmpDimissionAttendService extends IService<EmpDimissionAttend> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empDimissionattend empDimissionattend
-* @return IPage<EmpDimissionattend>
-*/
-IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empDimissionattend empDimissionattend
+ * @return IPage<EmpDimissionattend>
+ */
+ IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend);
-/**
-* 查询（所有）
-*
-* @param empDimissionattend empDimissionattend
-* @return List<EmpDimissionattend>
-*/
-List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend);
+ /**
+ * 查询（所有）
+ *
+ * @param empDimissionattend empDimissionattend
+ * @return List<EmpDimissionattend>
+ */
+ List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend);
-/**
-* 新增
-*
-* @param empDimissionattend empDimissionattend
-*/
-void createEmpDimissionattend(EmpDimissionAttend empDimissionattend);
+ /**
+ * 新增
+ *
+ * @param empDimissionattend empDimissionattend
+ */
+ void createEmpDimissionattend(EmpDimissionAttend empDimissionattend);
-/**
-* 修改
-*
-* @param empDimissionattend empDimissionattend
-*/
-void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend);
+ /**
+ * 修改
+ *
+ * @param empDimissionattend empDimissionattend
+ */
+ void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend);
-/**
-* 删除
-*
-* @param empDimissionattend empDimissionattend
-*/
-void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend);
+ /**
+ * 删除
+ *
+ * @param empDimissionattend empDimissionattend
+ */
+ void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpDimissionattend(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpDimissionattend(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java
index 7a0542e..edf799a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpInsurance
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工社保申请服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:23
-* @since JDK1.8
-*/
+ * name:EmpInsurance
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工社保申请服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:23
+ * @since JDK1.8
+ */
public interface IEmpInsuranceService extends IService<EmpInsurance> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empInsurance empInsurance
-* @return IPage<EmpInsurance>
-*/
-IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empInsurance empInsurance
+ * @return IPage<EmpInsurance>
+ */
+ IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance);
-/**
-* 查询（所有）
-*
-* @param empInsurance empInsurance
-* @return List<EmpInsurance>
-*/
-List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance);
+ /**
+ * 查询（所有）
+ *
+ * @param empInsurance empInsurance
+ * @return List<EmpInsurance>
+ */
+ List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance);
-/**
-* 新增
-*
-* @param empInsurance empInsurance
-*/
-void createEmpInsurance(EmpInsurance empInsurance);
+ /**
+ * 新增
+ *
+ * @param empInsurance empInsurance
+ */
+ void createEmpInsurance(EmpInsurance empInsurance);
-/**
-* 修改
-*
-* @param empInsurance empInsurance
-*/
-void updateEmpInsurance(EmpInsurance empInsurance);
+ /**
+ * 修改
+ *
+ * @param empInsurance empInsurance
+ */
+ void updateEmpInsurance(EmpInsurance empInsurance);
-/**
-* 删除
-*
-* @param empInsurance empInsurance
-*/
-void deleteEmpInsurance(EmpInsurance empInsurance);
+ /**
+ * 删除
+ *
+ * @param empInsurance empInsurance
+ */
+ void deleteEmpInsurance(EmpInsurance empInsurance);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpInsurance(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpInsurance(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
index e4ebbaa..6c43e4e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpLabortrouble
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工劳资案件服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:36
-* @since JDK1.8
-*/
+ * name:EmpLabortrouble
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工劳资案件服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:36
+ * @since JDK1.8
+ */
public interface IEmpLaborTroubleService extends IService<EmpLaborTrouble> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empLabortrouble empLabortrouble
-* @return IPage<EmpLabortrouble>
-*/
-IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empLabortrouble empLabortrouble
+ * @return IPage<EmpLabortrouble>
+ */
+ IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble);
-/**
-* 查询（所有）
-*
-* @param empLabortrouble empLabortrouble
-* @return List<EmpLabortrouble>
-*/
-List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble);
+ /**
+ * 查询（所有）
+ *
+ * @param empLabortrouble empLabortrouble
+ * @return List<EmpLabortrouble>
+ */
+ List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble);
-/**
-* 新增
-*
-* @param empLabortrouble empLabortrouble
-*/
-void createEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+ /**
+ * 新增
+ *
+ * @param empLabortrouble empLabortrouble
+ */
+ void createEmpLabortrouble(EmpLaborTrouble empLabortrouble);
-/**
-* 修改
-*
-* @param empLabortrouble empLabortrouble
-*/
-void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+ /**
+ * 修改
+ *
+ * @param empLabortrouble empLabortrouble
+ */
+ void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble);
-/**
-* 删除
-*
-* @param empLabortrouble empLabortrouble
-*/
-void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+ /**
+ * 删除
+ *
+ * @param empLabortrouble empLabortrouble
+ */
+ void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpLabortrouble(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpLabortrouble(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
index 70b83cc..67a5916 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* 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
+ */
public interface IEmpLeaveInfoService extends IService<EmpLeaveInfo> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empLeaveinfo empLeaveinfo
-* @return IPage<EmpLeaveinfo>
-*/
-IPage<EmpLeaveInfo> findEmpLeaveinfos(QueryRequest request, EmpLeaveInfo empLeaveinfo);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empLeaveinfo empLeaveinfo
+ * @return IPage<EmpLeaveinfo>
+ */
+ IPage<EmpLeaveInfo> findEmpLeaveInfos(QueryRequest request, EmpLeaveInfo empLeaveinfo);
-/**
-* 查询（所有）
-*
-* @param empLeaveinfo empLeaveinfo
-* @return List<EmpLeaveinfo>
-*/
-List<EmpLeaveInfo> findEmpLeaveinfos(EmpLeaveInfo empLeaveinfo);
+ /**
+ * 查询（所有）
+ *
+ * @param empLeaveinfo empLeaveinfo
+ * @return List<EmpLeaveinfo>
+ */
+ List<EmpLeaveInfo> findEmpLeaveInfos(EmpLeaveInfo empLeaveinfo);
-/**
-* 新增
-*
-* @param empLeaveinfo empLeaveinfo
-*/
-void createEmpLeaveinfo(EmpLeaveInfo empLeaveinfo);
+ /**
+ * 新增
+ *
+ * @param empLeaveinfo empLeaveinfo
+ */
+ void createEmpLeaveinfo(EmpLeaveInfo empLeaveinfo);
-/**
-* 修改
-*
-* @param empLeaveinfo empLeaveinfo
-*/
-void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo);
+ /**
+ * 修改
+ *
+ * @param empLeaveinfo empLeaveinfo
+ */
+ void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo);
-/**
-* 删除
-*
-* @param empLeaveinfo empLeaveinfo
-*/
-void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo);
+ /**
+ * 删除
+ *
+ * @param empLeaveinfo empLeaveinfo
+ */
+ void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpLeaveinfo(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpLeaveinfo(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
index 48c09d6..4a6a98b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpOccupational
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工伤案件服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:32
-* @since JDK1.8
-*/
+ * name:EmpOccupational
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工伤案件服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:32
+ * @since JDK1.8
+ */
public interface IEmpOccupationalService extends IService<EmpOccupational> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empOccupational empOccupational
-* @return IPage<EmpOccupational>
-*/
-IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empOccupational empOccupational
+ * @return IPage<EmpOccupational>
+ */
+ IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational);
-/**
-* 查询（所有）
-*
-* @param empOccupational empOccupational
-* @return List<EmpOccupational>
-*/
-List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational);
+ /**
+ * 查询（所有）
+ *
+ * @param empOccupational empOccupational
+ * @return List<EmpOccupational>
+ */
+ List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational);
-/**
-* 新增
-*
-* @param empOccupational empOccupational
-*/
-void createEmpOccupational(EmpOccupational empOccupational);
+ /**
+ * 新增
+ *
+ * @param empOccupational empOccupational
+ */
+ void createEmpOccupational(EmpOccupational empOccupational);
-/**
-* 修改
-*
-* @param empOccupational empOccupational
-*/
-void updateEmpOccupational(EmpOccupational empOccupational);
+ /**
+ * 修改
+ *
+ * @param empOccupational empOccupational
+ */
+ void updateEmpOccupational(EmpOccupational empOccupational);
-/**
-* 删除
-*
-* @param empOccupational empOccupational
-*/
-void deleteEmpOccupational(EmpOccupational empOccupational);
+ /**
+ * 删除
+ *
+ * @param empOccupational empOccupational
+ */
+ void deleteEmpOccupational(EmpOccupational empOccupational);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpOccupational(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpOccupational(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
index d5d2132..7afef25 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpPhysicalExamService.java
@@ -66,4 +66,15 @@
* @author: luoyibo
*/
void logicDelEmpPhysicalExam(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
index 8644b0d..d2839a4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpRemarkinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工备注信息服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:48
-* @since JDK1.8
-*/
+ * name:EmpRemarkinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工备注信息服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:48
+ * @since JDK1.8
+ */
public interface IEmpRemarkinfoService extends IService<EmpRemarkInfo> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empRemarkinfo empRemarkinfo
-* @return IPage<EmpRemarkinfo>
-*/
-IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empRemarkinfo empRemarkinfo
+ * @return IPage<EmpRemarkinfo>
+ */
+ IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo);
-/**
-* 查询（所有）
-*
-* @param empRemarkinfo empRemarkinfo
-* @return List<EmpRemarkinfo>
-*/
-List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo);
+ /**
+ * 查询（所有）
+ *
+ * @param empRemarkinfo empRemarkinfo
+ * @return List<EmpRemarkinfo>
+ */
+ List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo);
-/**
-* 新增
-*
-* @param empRemarkinfo empRemarkinfo
-*/
-void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
+ /**
+ * 新增
+ *
+ * @param empRemarkinfo empRemarkinfo
+ */
+ void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
-/**
-* 修改
-*
-* @param empRemarkinfo empRemarkinfo
-*/
-void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
+ /**
+ * 修改
+ *
+ * @param empRemarkinfo empRemarkinfo
+ */
+ void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
-/**
-* 删除
-*
-* @param empRemarkinfo empRemarkinfo
-*/
-void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
+ /**
+ * 删除
+ *
+ * @param empRemarkinfo empRemarkinfo
+ */
+ void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpRemarkinfo(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpRemarkinfo(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
index d24cbb3..004862f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpResign
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工辞职申请服务接口
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:18
-* @since JDK1.8
-*/
+ * name:EmpResign
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工辞职申请服务接口
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:18
+ * @since JDK1.8
+ */
public interface IEmpResignService extends IService<EmpResign> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empResign empResign
-* @return IPage<EmpResign>
-*/
-IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empResign empResign
+ * @return IPage<EmpResign>
+ */
+ IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign);
-/**
-* 查询（所有）
-*
-* @param empResign empResign
-* @return List<EmpResign>
-*/
-List<EmpResign> findEmpResigns(EmpResign empResign);
+ /**
+ * 查询（所有）
+ *
+ * @param empResign empResign
+ * @return List<EmpResign>
+ */
+ List<EmpResign> findEmpResigns(EmpResign empResign);
-/**
-* 新增
-*
-* @param empResign empResign
-*/
-void createEmpResign(EmpResign empResign);
+ /**
+ * 新增
+ *
+ * @param empResign empResign
+ */
+ void createEmpResign(EmpResign empResign);
-/**
-* 修改
-*
-* @param empResign empResign
-*/
-void updateEmpResign(EmpResign empResign);
+ /**
+ * 修改
+ *
+ * @param empResign empResign
+ */
+ void updateEmpResign(EmpResign empResign);
-/**
-* 删除
-*
-* @param empResign empResign
-*/
-void deleteEmpResign(EmpResign empResign);
+ /**
+ * 删除
+ *
+ * @param empResign empResign
+ */
+ void deleteEmpResign(EmpResign empResign);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpResign(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpResign(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
index 37cdfec..1f3db07 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
@@ -9,62 +9,72 @@
import java.util.List;
/**
-*
-* name:EmpUnemployment
-* package:cc.mrbird.febs.server.hr.controller
-* description:失业金领取表服务接口
-*
-* @author luoyibo
-* @date 2021-02-01 00:22:28
-* @since JDK1.8
-*/
+ * name:EmpUnemployment
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:失业金领取表服务接口
+ *
+ * @author luoyibo
+ * @date 2021-02-01 00:22:28
+ * @since JDK1.8
+ */
public interface IEmpUnemploymentService extends IService<EmpUnemployment> {
-/**
-* 查询（分页）
-*
-* @param request QueryRequest
-* @param empUnemployment empUnemployment
-* @return IPage<EmpUnemployment>
-*/
-IPage<EmpUnemployment> findEmpUnemployments(QueryRequest request, EmpUnemployment empUnemployment);
+ /**
+ * 查询（分页）
+ *
+ * @param request QueryRequest
+ * @param empUnemployment empUnemployment
+ * @return IPage<EmpUnemployment>
+ */
+ IPage<EmpUnemployment> findEmpUnemployments(QueryRequest request, EmpUnemployment empUnemployment);
-/**
-* 查询（所有）
-*
-* @param empUnemployment empUnemployment
-* @return List<EmpUnemployment>
-*/
-List<EmpUnemployment> findEmpUnemployments(EmpUnemployment empUnemployment);
+ /**
+ * 查询（所有）
+ *
+ * @param empUnemployment empUnemployment
+ * @return List<EmpUnemployment>
+ */
+ List<EmpUnemployment> findEmpUnemployments(EmpUnemployment empUnemployment);
-/**
-* 新增
-*
-* @param empUnemployment empUnemployment
-*/
-void createEmpUnemployment(EmpUnemployment empUnemployment);
+ /**
+ * 新增
+ *
+ * @param empUnemployment empUnemployment
+ */
+ void createEmpUnemployment(EmpUnemployment empUnemployment);
-/**
-* 修改
-*
-* @param empUnemployment empUnemployment
-*/
-void updateEmpUnemployment(EmpUnemployment empUnemployment);
+ /**
+ * 修改
+ *
+ * @param empUnemployment empUnemployment
+ */
+ void updateEmpUnemployment(EmpUnemployment empUnemployment);
-/**
-* 删除
-*
-* @param empUnemployment empUnemployment
-*/
-void deleteEmpUnemployment(EmpUnemployment empUnemployment);
+ /**
+ * 删除
+ *
+ * @param empUnemployment empUnemployment
+ */
+ void deleteEmpUnemployment(EmpUnemployment empUnemployment);
-/**
-*
-* 根据Id批量逻辑删除记录
-*
-* date 2021-01-28 10:48
-* @author: luoyibo
-* @param ids 待删除Id
-* @return void
-*/
-void logicDelEmpUnemployment(String ids);
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ void logicDelEmpUnemployment(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
index 35d74c0..4232a10 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpWorkExperienceService.java
@@ -66,4 +66,15 @@
* @author: luoyibo
*/
void logicDelEmpWorkExperience(String ids);
+
+ /**
+ * 从暂存状态转成正式状态
+ * <p>
+ * date 2021-02-04 21:11
+ *
+ * @param ids 待转换记录Id
+ * @return boolean
+ * @author: luoyibo
+ */
+ boolean momentToNormal(String ids);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
index 8f50d00..b765c74 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpAccidentCases::getDelFlag, 0);
+ queryWrapper.eq(EmpAccidentCases::getDelFlag, empAccidentcases.getDelFlag());
Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpAccidentCases::getDelFlag, 0);
+ queryWrapper.eq(EmpAccidentCases::getDelFlag, empAccidentcases.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -92,9 +92,16 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void logicDelEmpAccidentcases(String ids) {
+ public void logicDelEmpAccidentCases(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
empAccidentcasesMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empAccidentcasesMapper.momentToNormal(list, operatorId) > 0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
index a258298..c1dedc4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBadRecord::getDelFlag, 0);
+ queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord) {
LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBadRecord::getDelFlag, 0);
+ queryWrapper.eq(EmpBadRecord::getDelFlag, empBadrecord.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empBadrecordMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empBadrecordMapper.momentToNormal(list, operatorId) > 0;
+ }
}
\ No newline at end of file
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 b9076db..6bfdf4f 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
@@ -14,10 +14,12 @@
import cc.mrbird.febs.server.hr.mapper.EmpBaseInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -47,17 +49,20 @@
@Override
public IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBaseInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
+ if (StringUtils.isNotBlank(empBaseInfo.getSex())) {
+ queryWrapper.eq(EmpBaseInfo::getSex, empBaseInfo.getSex());
+ }
Page<EmpBaseInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<EmpBaseInfo> iPage = this.page(page, queryWrapper);
- ;
- // List<EmpBaseInfo> list = iPage.getRecords();
//设置部门
List<EmpBaseInfo> list = setDeptName(iPage.getRecords());
List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
list.forEach(p -> {
p.setSexName("1".equals(p.getSex()) ? "男" : "女");
- p.setJobName("测试岗位");
+ p.setEmpTypeName("1".equals(p.getEmpType()) ? "正式工" : "临时工");
+ p.setInsuranceTypeName("1".equals(p.getInsuranceType()) ? "（深户）五险一档" : "（非深户）五险一档");
+ p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交");
// 设置民族
p.setNationName(dicItems.stream()
.filter(k -> DicCode.NATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNation()))
@@ -96,7 +101,7 @@
@Override
public List<EmpBaseInfo> findEmpBaseInfos(EmpBaseInfo empBaseInfo) {
LambdaQueryWrapper<EmpBaseInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpBaseInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpBaseInfo::getDelFlag, empBaseInfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -104,8 +109,6 @@
@Transactional(rollbackFor = Exception.class)
public void createEmpBaseInfo(EmpBaseInfo empBaseInfo) {
empBaseInfo.setEmpId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- empBaseInfo.setDeptId(1L);
- empBaseInfo.setJobId(1L);
empBaseInfo.setCreator(operatorId);
empBaseInfo.setModifier(operatorId);
this.save(empBaseInfo);
@@ -169,4 +172,22 @@
}
return empBaseInfoList;
}
+
+ @Override
+ public boolean verifyEmpNumb(EmpBaseInfo empBaseInfo) {
+ QueryWrapper<EmpBaseInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().eq(EmpBaseInfo::getEmpNumb, empBaseInfo.getEmpNumb());
+ EmpBaseInfo tempEmpBaseInfo = this.getOne(queryWrapper);
+ if (tempEmpBaseInfo == null) {
+ return false;
+ }
+ return !empBaseInfo.getEmpId().equals(tempEmpBaseInfo.getEmpId());
+ }
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empBaseInfoMapper.momentToNormal(list, operatorId) > 0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index 4900ebc..adc53a7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpContractInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo) {
LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpContractInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpContractInfo::getDelFlag, empContractinfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empContractinfoMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empContractinfoMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
index 45bbdee..6c1300b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, empDimissionattend.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empDimissionattendMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empDimissionattendMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
index 6fa1039..ac252bc 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpInsurance::getDelFlag, 0);
+ queryWrapper.eq(EmpInsurance::getDelFlag, empInsurance.getDelFlag());
Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance) {
LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpInsurance::getDelFlag, 0);
+ queryWrapper.eq(EmpInsurance::getDelFlag, empInsurance.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empInsuranceMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empInsuranceMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
index be36aef..0b5e2d4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLaborTrouble::getDelFlag, 0);
+ queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLaborTrouble::getDelFlag, 0);
+ queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empLabortroubleMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empLabortroubleMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
index 870adfb..121f233 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -38,17 +38,17 @@
.orElse("1");
@Override
- public IPage<EmpLeaveInfo> findEmpLeaveinfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
+ public IPage<EmpLeaveInfo> findEmpLeaveInfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpLeaveInfo::getDelFlag, empLeaveinfo.getDelFlag());
Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@Override
- public List<EmpLeaveInfo> findEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
+ public List<EmpLeaveInfo> findEmpLeaveInfos(EmpLeaveInfo empLeaveinfo) {
LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpLeaveInfo::getDelFlag, empLeaveinfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empLeaveinfoMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empLeaveinfoMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index e9ed8b6..40f1b32 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpOccupational::getDelFlag, 0);
+ queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpOccupational::getDelFlag, 0);
+ queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empOccupationalMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empOccupationalMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
index 6907163..9ed37a4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpPhysicalExam> findEmpPhysicalExams(QueryRequest request, EmpPhysicalExam empPhysicalexam) {
LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpPhysicalExam::getDelFlag, 0);
+ queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpPhysicalExam> findEmpPhysicalExams(EmpPhysicalExam empPhysicalexam) {
LambdaQueryWrapper<EmpPhysicalExam> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpPhysicalExam::getDelFlag, 0);
+ queryWrapper.eq(EmpPhysicalExam::getDelFlag, empPhysicalexam.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empPhysicalexamMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empPhysicalexamMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index 0fbe628..9b985dd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
+ queryWrapper.eq(EmpRemarkInfo::getDelFlag, empRemarkinfo.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empRemarkinfoMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empRemarkinfoMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index ce302be..2de822a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, 0);
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpResign> findEmpResigns(EmpResign empResign) {
LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpResign::getDelFlag, 0);
+ queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empResignMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empResignMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 891794a..63adc3d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpUnemployment> findEmpUnemployments(QueryRequest request, EmpUnemployment empUnemployment) {
LambdaQueryWrapper<EmpUnemployment> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpUnemployment::getDelFlag, 0);
+ queryWrapper.eq(EmpUnemployment::getDelFlag, empUnemployment.getDelFlag());
Page<EmpUnemployment> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpUnemployment> findEmpUnemployments(EmpUnemployment empUnemployment) {
LambdaQueryWrapper<EmpUnemployment> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpUnemployment::getDelFlag, 0);
+ queryWrapper.eq(EmpUnemployment::getDelFlag, empUnemployment.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -97,4 +97,11 @@
List<String> list = new ArrayList<>(Arrays.asList(str));
empUnemploymentMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empUnemploymentMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
index ec37857..4708d77 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpWorkExperienceServiceImpl.java
@@ -40,7 +40,7 @@
@Override
public IPage<EmpWorkExperience> findEmpWorkExperiences(QueryRequest request, EmpWorkExperience empWorkexperience) {
LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpWorkExperience::getDelFlag, 0);
+ queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
Page<EmpWorkExperience> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -48,7 +48,7 @@
@Override
public List<EmpWorkExperience> findEmpWorkExperiences(EmpWorkExperience empWorkexperience) {
LambdaQueryWrapper<EmpWorkExperience> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(EmpWorkExperience::getDelFlag, 0);
+ queryWrapper.eq(EmpWorkExperience::getDelFlag,empWorkexperience.getDelFlag());
return this.baseMapper.selectList(queryWrapper);
}
@@ -100,4 +100,11 @@
list.addAll(Arrays.asList(str));
empWorkexperienceMapper.logicDeleteByIds(list, operatorId);
}
+
+ @Override
+ public boolean momentToNormal(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ return empWorkexperienceMapper.momentToNormal(list, operatorId)>0;
+ }
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/resources/spy.properties b/febs-server/febs-server-hr/src/main/resources/spy.properties
new file mode 100644
index 0000000..52c6eef
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/resources/spy.properties
@@ -0,0 +1,13 @@
+# p6spy\u914D\u7F6E\uFF0C\u6587\u6863 https://p6spy.readthedocs.io/en/latest/configandusage.html
+# \u4F7F\u7528\u65E5\u5FD7\u7CFB\u7EDF\u8BB0\u5F55 sql
+appender=com.p6spy.engine.spy.appender.Slf4JLogger
+# \u81EA\u5B9A\u4E49\u65E5\u5FD7\u6253\u5370
+logMessageFormat=cc.mrbird.febs.server.hr.configure.P6spySqlFormatConfigure
+# \u662F\u5426\u5F00\u542F\u6162 SQL\u8BB0\u5F55
+outagedetection=true
+# \u6162 SQL\u8BB0\u5F55\u6807\u51C6 2 \u79D2
+outagedetectioninterval=2
+# \u5F00\u542F\u8FC7\u6EE4
+filter=true
+# \u914D\u7F6E\u4E0D\u6253\u5370\u7684\u5185\u5BB9
+exclude=select 1
\ No newline at end of file
--
Gitblit v1.8.0