From 8d58bd6128cac637d6a78378b2f00104052d4426 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 31 一月 2021 13:58:46 +0800
Subject: [PATCH] feat(人力资源微服务): 合同信息基本增、删、改功能实现
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 116 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 196 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java | 24
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 50
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 390 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java | 116 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 116 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 22
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java | 22
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 212 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpRemarkinfoService.java | 15
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 202 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpInsuranceMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java | 156 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java | 20
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java | 67
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 116 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 116 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 118 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpInsuranceService.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccidentCasesMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java | 116 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpContractInfoService.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java | 104
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java | 44
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpOccupationalMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java | 22
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java | 207 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java | 126
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpOccupationalService.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java | 20
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 202 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpResignMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLeaveInfoMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java | 306 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpLaborTroubleMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpDimissionAttendService.java | 13
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpRemarkInfoMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java | 172 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java | 22
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionAttendMapper.java | 30
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBadRecordMapper.java | 61
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java | 116 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java | 20
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 116 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLeaveInfoService.java | 13
50 files changed, 2,519 insertions(+), 1,583 deletions(-)
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 d239618..9209c75 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
@@ -22,38 +22,38 @@
* description:员工意外险案件控制器
*
* @author luoyibo
-* @date 2021-01-24 20:36:10
+* @date 2021-01-31 11:26:27
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
-@RequestMapping("empAccidentcases")
+@RequestMapping("empAccidentCases")
@RequiredArgsConstructor
public class EmpAccidentCasesController {
-private final IEmpAccidentCasesService empAccidentcasesService;
+private final IEmpAccidentCasesService empAccidentCasesService;
@GetMapping
@PreAuthorize("hasAuthority('empAccidentcases:list')")
-public FebsResponse getAllEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
-return new FebsResponse().data(empAccidentcasesService.findEmpAccidentcasess(empAccidentcases));
+public FebsResponse getAllEmpAccidentCases(EmpAccidentCases empAccidentcases) {
+return new FebsResponse().data(empAccidentCasesService.findEmpAccidentcasess(empAccidentcases));
}
@GetMapping("list")
@PreAuthorize("hasAuthority('empAccidentcases:list')")
-public FebsResponse empAccidentcasesList(QueryRequest request, EmpAccidentCases empAccidentcases) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empAccidentcasesService.findEmpAccidentcasess(request, empAccidentcases));
+public FebsResponse empAccidentCasesList(QueryRequest request, EmpAccidentCases empAccidentcases) {
+Map<String, Object> dataTable = FebsUtil.getDataTable(this.empAccidentCasesService.findEmpAccidentcasess(request, empAccidentcases));
return new FebsResponse().data(dataTable);
}
@PostMapping
@PreAuthorize("hasAuthority('empAccidentcases:add')")
-public void addEmpAccidentcases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
+public void addEmpAccidentCases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
try {
-this.empAccidentcasesService.createEmpAccidentcases(empAccidentcases);
+this.empAccidentCasesService.createEmpAccidentcases(empAccidentcases);
} catch (Exception e) {
-String message = "新增EmpAccidentcases失败";
+String message = "新增员工意外险案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -61,11 +61,23 @@
@DeleteMapping
@PreAuthorize("hasAuthority('empAccidentcases:delete')")
-public void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
+public void deleteEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
try {
-this.empAccidentcasesService.deleteEmpAccidentcases(empAccidentcases);
+this.empAccidentCasesService.deleteEmpAccidentcases(empAccidentcases);
} catch (Exception e) {
-String message = "删除EmpAccidentcases失败";
+String message = "删除员工意外险案件失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empAccidentcases:delete')")
+public void logicDeleteEmpAccidentCases(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empAccidentCasesService.logicDelEmpAccidentcases(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工意外险案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -73,11 +85,11 @@
@PutMapping
@PreAuthorize("hasAuthority('empAccidentcases:update')")
-public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
+public void updateEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
try {
-this.empAccidentcasesService.updateEmpAccidentcases(empAccidentcases);
+this.empAccidentCasesService.updateEmpAccidentcases(empAccidentcases);
} catch (Exception e) {
-String message = "修改EmpAccidentcases失败";
+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 ee47f87..2fccd01 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
@@ -1,7 +1,5 @@
package cc.mrbird.febs.server.hr.controller;
-import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
@@ -18,14 +16,15 @@
import java.util.Map;
/**
- * name:EmpBadrecord
- * package:cc.mrbird.febs.server.hr.controller
- * description:员工不良记录信息控制器
- *
- * @author luoyibo
- * @date 2021-01-24 20:35:55
- * @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
+*/
@Slf4j
@Validated
@RestController
@@ -33,57 +32,66 @@
@RequiredArgsConstructor
public class EmpBadRecordController {
- private final IEmpBadRecordService empBadRecordService;
+private final IEmpBadRecordService empBadrecordService;
- @GetMapping("sequence")
- public long getSequence(){
- return SequenceUtil.generateId(0L,ModuleCode.HR_EMPLOYEE);
- }
- @GetMapping
- @PreAuthorize("hasAuthority('empBadrecord:list')")
- public FebsResponse getAllEmpBadRecords(EmpBadRecord empBadrecord) {
- return new FebsResponse().data(empBadRecordService.findEmpBadRecords(empBadrecord));
- }
+@GetMapping
+@PreAuthorize("hasAuthority('empBadrecord:list')")
+public FebsResponse getAllEmpBadrecords(EmpBadRecord empBadrecord) {
+return new FebsResponse().data(empBadrecordService.findEmpBadrecords(empBadrecord));
+}
- @GetMapping("list")
- @PreAuthorize("hasAuthority('empBadrecord:list')")
- public FebsResponse empBadRecordList(QueryRequest request, EmpBadRecord empBadrecord) {
- Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBadRecordService.findEmpBadRecords(request, empBadrecord));
- return new FebsResponse().data(dataTable);
- }
+@GetMapping("list")
+@PreAuthorize("hasAuthority('empBadrecord:list')")
+public FebsResponse empBadrecordList(QueryRequest request, EmpBadRecord empBadrecord) {
+Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBadrecordService.findEmpBadrecords(request, empBadrecord));
+return new FebsResponse().data(dataTable);
+}
- @PostMapping
- @PreAuthorize("hasAuthority('empBadrecord:add')")
- public void addEmpBadRecord(@Valid EmpBadRecord empBadrecord) throws FebsException {
- try {
- this.empBadRecordService.createEmpBadRecord(empBadrecord);
- } catch (Exception e) {
- String message = "新增EmpBadrecord失败";
- log.error(message, e);
- throw new FebsException(message);
- }
- }
+@PostMapping
+@PreAuthorize("hasAuthority('empBadrecord:add')")
+public void addEmpBadrecord(@Valid EmpBadRecord empBadrecord) throws FebsException {
+try {
+this.empBadrecordService.createEmpBadrecord(empBadrecord);
+} catch (Exception e) {
+String message = "新增员工不良记录信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
- @DeleteMapping("{ids}")
- @PreAuthorize("hasAuthority('empBadrecord:delete')")
- public void logicDeleteEmpBadRecord(@PathVariable("ids") String ids) throws FebsException {
- try {
- this.empBadRecordService.logicDelEmpBadRecord(ids);
- } catch (Exception e) {
- String message = "逻辑删除员工不良记录失败";
- log.error(message, e);
- throw new FebsException(message);
- }
- }
- @PutMapping
- @PreAuthorize("hasAuthority('empBadrecord:update')")
- public void updateEmpBadRecord(EmpBadRecord empBadrecord) throws FebsException {
- try {
- this.empBadRecordService.updateEmpBadRecord(empBadrecord);
- } catch (Exception e) {
- String message = "修改员工不良记录失败";
- log.error(message, e);
- throw new FebsException(message);
- }
- }
+@DeleteMapping
+@PreAuthorize("hasAuthority('empBadrecord:delete')")
+public void deleteEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+try {
+this.empBadrecordService.deleteEmpBadrecord(empBadrecord);
+} catch (Exception e) {
+String message = "删除员工不良记录信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empBadrecord:delete')")
+public void logicDeleteEmpBadrecord(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empBadrecordService.logicDelEmpBadrecord(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工不良记录信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@PutMapping
+@PreAuthorize("hasAuthority('empBadrecord:update')")
+public void updateEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+try {
+this.empBadrecordService.updateEmpBadrecord(empBadrecord);
+} 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/EmpContractInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java
index 39a8f76..430c113 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
@@ -22,13 +22,13 @@
* description:员工合同信息控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:42
+* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
-@RequestMapping("empContractinfo")
+@RequestMapping("empContractInfo")
@RequiredArgsConstructor
public class EmpContractInfoController {
@@ -53,7 +53,7 @@
try {
this.empContractinfoService.createEmpContractinfo(empContractinfo);
} catch (Exception e) {
-String message = "新增EmpContractinfo失败";
+String message = "新增员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empContractinfoService.deleteEmpContractinfo(empContractinfo);
} catch (Exception e) {
-String message = "删除EmpContractinfo失败";
+String message = "删除员工合同信息失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empContractinfo:delete')")
+public void logicDeleteEmpContractinfo(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empContractinfoService.logicDelEmpContractinfo(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empContractinfoService.updateEmpContractinfo(empContractinfo);
} catch (Exception e) {
-String message = "修改EmpContractinfo失败";
+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 93bbba2..84ba129 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
@@ -22,13 +22,13 @@
* description:离职当月考勤控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:38
+* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
-@RequestMapping("empDimissionattend")
+@RequestMapping("empDimissionAttend")
@RequiredArgsConstructor
public class EmpDimissionAttendController {
@@ -53,7 +53,7 @@
try {
this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
-String message = "新增EmpDimissionattend失败";
+String message = "新增离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empDimissionattendService.deleteEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
-String message = "删除EmpDimissionattend失败";
+String message = "删除离职当月考勤失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empDimissionattend:delete')")
+public void logicDeleteEmpDimissionattend(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empDimissionattendService.logicDelEmpDimissionattend(ids);
+} catch (Exception e) {
+String message = "逻辑删除离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
-String message = "修改EmpDimissionattend失败";
+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 9b5ce6b..89dbdab 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
@@ -22,7 +22,7 @@
* description:员工社保申请控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:33
+* @date 2021-01-31 11:26:23
* @since JDK1.8
*/
@Slf4j
@@ -53,7 +53,7 @@
try {
this.empInsuranceService.createEmpInsurance(empInsurance);
} catch (Exception e) {
-String message = "新增EmpInsurance失败";
+String message = "新增员工社保申请失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empInsuranceService.deleteEmpInsurance(empInsurance);
} catch (Exception e) {
-String message = "删除EmpInsurance失败";
+String message = "删除员工社保申请失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empInsurance:delete')")
+public void logicDeleteEmpInsurance(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empInsuranceService.logicDelEmpInsurance(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工社保申请失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empInsuranceService.updateEmpInsurance(empInsurance);
} catch (Exception e) {
-String message = "修改EmpInsurance失败";
+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 cea43d5..f0e2068 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
@@ -22,13 +22,13 @@
* description:员工劳资案件控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:59
+* @date 2021-01-31 11:26:36
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
-@RequestMapping("empLabortrouble")
+@RequestMapping("empLaborTrouble")
@RequiredArgsConstructor
public class EmpLaborTroubleController {
@@ -53,7 +53,7 @@
try {
this.empLabortroubleService.createEmpLabortrouble(empLabortrouble);
} catch (Exception e) {
-String message = "新增EmpLabortrouble失败";
+String message = "新增员工劳资案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empLabortroubleService.deleteEmpLabortrouble(empLabortrouble);
} catch (Exception e) {
-String message = "删除EmpLabortrouble失败";
+String message = "删除员工劳资案件失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empLabortrouble:delete')")
+public void logicDeleteEmpLabortrouble(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empLabortroubleService.logicDelEmpLabortrouble(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工劳资案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empLabortroubleService.updateEmpLabortrouble(empLabortrouble);
} catch (Exception e) {
-String message = "修改EmpLabortrouble失败";
+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 28b1d64..73892c8 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
@@ -22,13 +22,13 @@
* description:员工请假记录控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:29
+* @date 2021-01-31 11:26:13
* @since JDK1.8
*/
@Slf4j
@Validated
@RestController
-@RequestMapping("empLeaveinfo")
+@RequestMapping("empLeaveInfo")
@RequiredArgsConstructor
public class EmpLeaveInfoController {
@@ -53,7 +53,7 @@
try {
this.empLeaveinfoService.createEmpLeaveinfo(empLeaveinfo);
} catch (Exception e) {
-String message = "新增EmpLeaveinfo失败";
+String message = "新增员工请假记录失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empLeaveinfoService.deleteEmpLeaveinfo(empLeaveinfo);
} catch (Exception e) {
-String message = "删除EmpLeaveinfo失败";
+String message = "删除员工请假记录失败";
+log.error(message, e);
+throw new FebsException(message);
+}
+}
+
+@DeleteMapping("{ids}")
+@PreAuthorize("hasAuthority('empLeaveinfo:delete')")
+public void logicDeleteEmpLeaveinfo(@PathVariable("ids") String ids) throws FebsException {
+try {
+this.empLeaveinfoService.logicDelEmpLeaveinfo(ids);
+} catch (Exception e) {
+String message = "逻辑删除员工请假记录失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,7 +89,7 @@
try {
this.empLeaveinfoService.updateEmpLeaveinfo(empLeaveinfo);
} catch (Exception e) {
-String message = "修改EmpLeaveinfo失败";
+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 cc0c24f..203bff1 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
@@ -22,7 +22,7 @@
* description:员工工伤案件控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:24
+* @date 2021-01-31 11:26:32
* @since JDK1.8
*/
@Slf4j
@@ -53,7 +53,7 @@
try {
this.empOccupationalService.createEmpOccupational(empOccupational);
} catch (Exception e) {
-String message = "新增EmpOccupational失败";
+String message = "新增员工工伤案件失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empOccupationalService.deleteEmpOccupational(empOccupational);
} catch (Exception e) {
-String message = "删除EmpOccupational失败";
+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);
}
@@ -77,7 +89,7 @@
try {
this.empOccupationalService.updateEmpOccupational(empOccupational);
} catch (Exception e) {
-String message = "修改EmpOccupational失败";
+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 2982988..93d1cdd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpRemarkInfoController.java
@@ -1,7 +1,7 @@
package cc.mrbird.febs.server.hr.controller;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
-import cc.mrbird.febs.server.hr.service.IEmpRemarkInfoService;
+import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
@@ -22,7 +22,7 @@
* description:员工备注信息控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:15
+* @date 2021-01-31 11:26:48
* @since JDK1.8
*/
@Slf4j
@@ -32,7 +32,7 @@
@RequiredArgsConstructor
public class EmpRemarkInfoController {
-private final IEmpRemarkInfoService empRemarkinfoService;
+private final IEmpRemarkinfoService empRemarkinfoService;
@GetMapping
@PreAuthorize("hasAuthority('empRemarkinfo:list')")
@@ -53,7 +53,7 @@
try {
this.empRemarkinfoService.createEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
-String message = "新增EmpRemarkinfo失败";
+String message = "新增员工备注信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empRemarkinfoService.deleteEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
-String message = "删除EmpRemarkinfo失败";
+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);
}
@@ -77,7 +89,7 @@
try {
this.empRemarkinfoService.updateEmpRemarkinfo(empRemarkinfo);
} catch (Exception e) {
-String message = "修改EmpRemarkinfo失败";
+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 de3cebc..6aaa417 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
@@ -22,7 +22,7 @@
* description:员工辞职申请控制器
*
* @author luoyibo
-* @date 2021-01-24 20:35:08
+* @date 2021-01-31 11:26:18
* @since JDK1.8
*/
@Slf4j
@@ -53,7 +53,7 @@
try {
this.empResignService.createEmpResign(empResign);
} catch (Exception e) {
-String message = "新增EmpResign失败";
+String message = "新增员工辞职申请失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +65,19 @@
try {
this.empResignService.deleteEmpResign(empResign);
} catch (Exception e) {
-String message = "删除EmpResign失败";
+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);
}
@@ -77,7 +89,7 @@
try {
this.empResignService.updateEmpResign(empResign);
} catch (Exception e) {
-String message = "修改EmpResign失败";
+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/EmpAccidentCases.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
index 48fe0a1..57fa6ce 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccidentCases.java
@@ -1,179 +1,199 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
- import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.math.BigDecimal;
+
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpAccidentcases
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工意外险案件数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:36:10
-* @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
+ */
@Data
@TableName("t_emp_accidentcases")
-public class EmpAccidentCases {
+public class EmpAccidentCases implements Serializable {
- /**
- * 案件Id
- */
- @TableId(value = "accidentId", type = IdType.AUTO)
- private Long accidentId;
+ private static final long serialVersionUID = 3423747469056866015L;
+ @FieldInfo(name = "accidentId", type = "bigint", explain = "案件Id")
+ @TableId(value = "accidentId")
+ private Long accidentId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- *
- */
- @TableField("injuredTime")
- private Date injuredTime;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 受伤地点
- */
- @TableField("injuredAddress")
- private String injuredAddress;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 受伤部位
- */
- @TableField("injuredPart")
- private String injuredPart;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- *
- */
- @TableField("injuredDiacrisis")
- private String injuredDiacrisis;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 受伤经过描述
- */
- @TableField("injuredDescribe")
- private String injuredDescribe;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 就诊医院
- */
- @TableField("hospitalName")
- private String hospitalName;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 就诊科室
- */
- @TableField("treatmentName")
- private String treatmentName;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 是否住院
- */
- @TableField("hospitalizatioFlag")
- private Integer hospitalizatioFlag;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
- /**
- * 床号
- */
- @TableField("bedNumb")
- private Byte bedNumb;
+ @FieldInfo(name = "injuredTime", type = "datetime", explain = "")
+ @TableField("injuredTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date injuredTime;
- /**
- * 报案时间
- */
- @TableField("reprotTime")
- private Date reprotTime;
+ @FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
+ @TableField("injuredAddress")
+ private String injuredAddress = "";
- /**
- *
- */
- @TableField("submitTime")
- private Date submitTime;
+ @FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
+ @TableField("injuredPart")
+ private String injuredPart = "";
- /**
- * 递交人
- */
- @TableField("sbumitBy")
- private String sbumitBy;
+ @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "")
+ @TableField("injuredDiacrisis")
+ private String injuredDiacrisis = "";
- /**
- * 医疗总费用
- */
- @TableField("expensesFee")
- private BigDecimal expensesFee;
- /**
- * 报单号
- */
- @TableField("expenseReport")
- private String expenseReport;
+ @FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
+ @TableField("injuredDescribe")
+ private String injuredDescribe = "";
- /**
- *
- */
- @TableField("innsureFee")
- private BigDecimal innsureFee;
- /**
- * 人事处理时间
- */
- @TableField("hrDoDate")
- private Date hrDoDate;
+ @FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
+ @TableField("hospitalName")
+ private String hospitalName = "";
- /**
- * 案结日期
- */
- @TableField("settleDate")
- private Date settleDate;
+ @FieldInfo(name = "treatmentName", type = "varchar", explain = "就诊科室")
+ @TableField("treatmentName")
+ private String treatmentName = "";
- /**
- * 结案状态 0-未结案 1-已结案
- */
- @TableField("settleStatus")
- private Integer settleStatus;
+ @FieldInfo(name = "hospitalizatioFlag", type = "bit", explain = "是否住院")
+ @TableField("hospitalizatioFlag")
+ private Integer hospitalizatioFlag = 0;
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
+ @TableField("bedNumb")
+ private Integer bedNumb = 0;
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
+ @TableField("reprotTime")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date reprotTime;
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "submitTime", type = "datetime", explain = "")
+ @TableField("submitTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date submitTime;
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
+ @TableField("sbumitBy")
+ private String sbumitBy = "";
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
+ @TableField("expensesFee")
+ private BigDecimal expensesFee = BigDecimal.ZERO;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
+ @TableField("expenseReport")
+ private String expenseReport = "";
+
+ @FieldInfo(name = "innsureFee", type = "decimal", explain = "")
+ @TableField("innsureFee")
+ private BigDecimal innsureFee = BigDecimal.ZERO;
+
+ @FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
+ @TableField("hrDoDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date hrDoDate;
+
+ @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
+ @TableField("settleDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date settleDate;
+
+ @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
+ @TableField("settleStatus")
+ private Integer settleStatus = 0;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
index 44ef679..75e00d9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
@@ -1,22 +1,21 @@
package cc.mrbird.febs.server.hr.entity;
+import java.io.Serializable;
+import java.util.Date;
+
import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
/**
* name:EmpBadrecord
@@ -24,38 +23,53 @@
* description:员工不良记录信息数据表映射实体
*
* @author luoyibo
- * @date 2021-01-24 20:35:55
+ * @date 2021-01-31 11:26:42
* @since JDK1.8
*/
@Data
-@TableName("t_emp_badRecord")
+@TableName("t_emp_badrecord")
public class EmpBadRecord implements Serializable {
- private static final long serialVersionUID = 4876027855128737152L;
-
+ private static final long serialVersionUID = 3681849796837950530L;
@FieldInfo(name = "badId", type = "bigint", explain = "不良记录Id")
@TableId(value = "badId")
- private Long badId;
+ private Long badId = 0L;
@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
- private Long empId;
+ private Long empId = 0L;
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
- private String empName;
+ private String empName = "";
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
- private String empNumb;
+ private String empNumb = "";
+
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
- private String certificateNumb;
+ private String certificateNumb = "";
- @FieldInfo(name = "department", type = "varchar", explain = "所属部门")
- @TableField("department")
- private String department;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
+
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
+
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
@FieldInfo(name = "badDate", type = "date", explain = "不良记录日期")
@TableField("badDate")
@@ -66,11 +80,11 @@
@FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
@TableField("reporter")
- private String reporter;
+ private String reporter = "";
@FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
@TableField("badContent")
- private String badContent;
+ private String badContent = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -81,7 +95,7 @@
@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
- private String creator;
+ private String creator = "";
@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@@ -92,18 +106,19 @@
@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
- private String modifier;
+ private String modifier = "";
@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
- private Integer delFlag;
+ private Integer delFlag = 0;
@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
- private Integer version;
+ private Integer version = 0;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
- private String remark;
+ private String remark = "";
+
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index 57d110a..ab0581a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -1,114 +1,142 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpContractinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工合同信息数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:42
-* @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
+ */
@Data
@TableName("t_emp_contractinfo")
-public class EmpContractInfo {
+public class EmpContractInfo implements Serializable {
- /**
- * 合同Id
- */
- @TableId(value = "contractId", type = IdType.AUTO)
- private Long contractId;
+ private static final long serialVersionUID = 4152214737054224645L;
+ @FieldInfo(name = "contractId", type = "bigint", explain = "合同Id")
+ @TableId(value = "contractId")
+ private Long contractId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 开始日期
- */
- @TableField("beginDate")
- private Date beginDate;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 结束日期
- */
- @TableField("endDate")
- private Date endDate;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 合同状态
- */
- @TableField("contractStatus")
- private String contractStatus;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 合同期限(年)
- */
- @TableField("contractPeiod")
- private Byte contractPeiod;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- * 合同办理人
- */
- @TableField("transactor")
- private String transactor;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 合同签订日期
- */
- @TableField("signingDate")
- private Date signingDate;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
+ @TableField("beginDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date beginDate;
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
+ @TableField("endDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
+ @TableField("contractStatus")
+ private String contractStatus = "";
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @TableField("contractPeriod")
+ private Integer contractPeriod = 0;
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
+ @TableField("transactor")
+ private String transactor = "";
+
+ @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
+ @TableField("signingDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date signingDate;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
index bbea401..7c86b27 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
@@ -1,110 +1,136 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
- import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.math.BigDecimal;
+
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpDimissionattend
-* package:cc.mrbird.febs.server.hr.controller
-* description:离职当月考勤数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:38
-* @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
+ */
@Data
@TableName("t_emp_dimissionattend")
-public class EmpDimissionAttend {
+public class EmpDimissionAttend implements Serializable {
- /**
- * 离职当月考勤Id
- */
- @TableId(value = "dimissionAttendId", type = IdType.AUTO)
- private Long dimissionAttendId;
+ private static final long serialVersionUID = 6080263775807562989L;
+ @FieldInfo(name = "dimissionAttendId", type = "bigint", explain = "离职当月考勤Id")
+ @TableId(value = "dimissionAttendId")
+ private Long dimissionAttendId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 离职考勤月份
- */
- @TableField("attendMonth")
- private Byte attendMonth;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 加班小时
- */
- @TableField("overtimeHour")
- private BigDecimal overtimeHour;
- /**
- * 加班（天）
- */
- @TableField("overtimeDay")
- private BigDecimal overtimeDay;
- /**
- * 请假（天）
- */
- @TableField("leaveDay")
- private BigDecimal leaveDay;
- /**
- * 有无代扣款项
- */
- @TableField("deduct")
- private BigDecimal deduct;
- /**
- * 旷工（天）
- */
- @TableField("absenteeism")
- private BigDecimal absenteeism;
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
+
+ @FieldInfo(name = "attendMonth", type = "tinyint", explain = "离职考勤月份")
+ @TableField("attendMonth")
+ private Integer attendMonth = 0;
+
+ @FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
+ @TableField("overtimeHour")
+ private BigDecimal overtimeHour = BigDecimal.ZERO;
+
+ @FieldInfo(name = "overtimeDay", type = "decimal", explain = "加班（天）")
+ @TableField("overtimeDay")
+ private BigDecimal overtimeDay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假（天）")
+ @TableField("leaveDay")
+ private BigDecimal leaveDay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "deduct", type = "decimal", explain = "有无代扣款项")
+ @TableField("deduct")
+ private BigDecimal deduct = BigDecimal.ZERO;
+
+ @FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
+ @TableField("absenteeism")
+ private BigDecimal absenteeism = BigDecimal.ZERO;
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index b6370bc..1646fc7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -1,114 +1,136 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpInsurance
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工社保申请数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:33
-* @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
+ */
@Data
@TableName("t_emp_insurance")
-public class EmpInsurance {
+public class EmpInsurance implements Serializable {
- /**
- * 社保Id
- */
- @TableId(value = "insuranceId", type = IdType.AUTO)
- private Long insuranceId;
+ private static final long serialVersionUID = 208703298339870887L;
+ @FieldInfo(name = "insuranceId", type = "bigint", explain = "社保Id")
+ @TableId(value = "insuranceId")
+ private Long insuranceId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 申请日期
- */
- @TableField("applayDate")
- private Date applayDate;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 申请人
- */
- @TableField("proposer")
- private String proposer;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 社保档位
- */
- @TableField("insuranceGaers")
- private String insuranceGaers;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- * 是否已报告 0-未报告 1-已报告
- */
- @TableField("reportStatus")
- private Integer reportStatus;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 申请状态 0-未申请 1-已申请
- */
- @TableField("applayStatus")
- private Integer applayStatus;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 审核人
- */
- @TableField("auditor")
- private String auditor;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
+ @TableField("applayDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date applayDate;
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "proposer", type = "varchar", explain = "申请人")
+ @TableField("proposer")
+ private String proposer = "";
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "insuranceGaers", type = "varchar", explain = "社保档位")
+ @TableField("insuranceGaers")
+ private String insuranceGaers = "";
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告 0-未报告 1-已报告")
+ @TableField("reportStatus")
+ private Integer reportStatus = 0;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 0-未申请 1-已申请")
+ @TableField("applayStatus")
+ private Integer applayStatus = 0;
+
+ @FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
+ @TableField("auditor")
+ private String auditor = "";
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
index d9d3387..6814f8a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
@@ -1,120 +1,146 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
- import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.math.BigDecimal;
+
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpLabortrouble
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工劳资案件数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:59
-* @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
+ */
@Data
@TableName("t_emp_labortrouble")
-public class EmpLaborTrouble {
+public class EmpLaborTrouble implements Serializable {
- /**
- * 仲裁Id
- */
- @TableId(value = "arbitrationId", type = IdType.AUTO)
- private String arbitrationId;
+ private static final long serialVersionUID = -7587978188799851715L;
+ @FieldInfo(name = "arbitrationId", type = "bigint", explain = "仲裁Id")
+ @TableId(value = "arbitrationId")
+ private Long arbitrationId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 仲裁日期
- */
- @TableField("arbitrationDate")
- private Date arbitrationDate;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 仲裁类型
- */
- @TableField("arbitrationType")
- private String arbitrationType;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 仲裁事由
- */
- @TableField("arbitrationReason")
- private String arbitrationReason;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- * 报备人
- */
- @TableField("reporter")
- private String reporter;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 仲裁赔付（元）
- */
- @TableField("arbitrationPay")
- private BigDecimal arbitrationPay;
- /**
- * 仲裁状态
- */
- @TableField("arbitrationStatus")
- private Integer arbitrationStatus;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 案结日期
- */
- @TableField("settleDate")
- private Date settleDate;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "arbitrationDate", type = "date", explain = "仲裁日期")
+ @TableField("arbitrationDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date arbitrationDate;
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "arbitrationType", type = "varchar", explain = "仲裁类型")
+ @TableField("arbitrationType")
+ private String arbitrationType = "";
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "arbitrationReason", type = "varchar", explain = "仲裁事由")
+ @TableField("arbitrationReason")
+ private String arbitrationReason = "";
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+ @TableField("reporter")
+ private String reporter = "";
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "arbitrationPay", type = "decimal", explain = "仲裁赔付（元）")
+ @TableField("arbitrationPay")
+ private BigDecimal arbitrationPay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
+ @TableField("arbitrationStatus")
+ private Integer arbitrationStatus = 0;
+
+ @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
+ @TableField("settleDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date settleDate;
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
index 6804629..11bd347 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
@@ -1,114 +1,145 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
- import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.math.BigDecimal;
+
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpLeaveinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工请假记录数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:29
-* @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
+ */
@Data
@TableName("t_emp_leaveinfo")
-public class EmpLeaveInfo {
+public class EmpLeaveInfo implements Serializable {
- /**
- * 请假申请Id
- */
- @TableId(value = "leaveId", type = IdType.AUTO)
- private Long leaveId;
+ private static final long serialVersionUID = -906183894054123470L;
+ @FieldInfo(name = "leaveId", type = "bigint", explain = "请假申请Id")
+ @TableId(value = "leaveId")
+ private Long leaveId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 开始时间
- */
- @TableField("beginTime")
- private Date beginTime;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 结束时间
- */
- @TableField("endTime")
- private Date endTime;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 请假类型
- */
- @TableField("leaveType")
- private String leaveType;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- * 请假天数
- */
- @TableField("leaveDay")
- private BigDecimal leaveDay;
- /**
- * 报备人
- */
- @TableField("reporter")
- private String reporter;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 到岗时间
- */
- @TableField("returnDate")
- private Date returnDate;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "beginTime", type = "datetime", explain = "开始时间")
+ @TableField("beginTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date beginTime;
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "endTime", type = "datetime", explain = "结束时间")
+ @TableField("endTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
+ @TableField("leaveType")
+ private String leaveType = "";
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
+ @TableField("leaveDay")
+ private BigDecimal leaveDay = BigDecimal.ZERO;
+
+ @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+ @TableField("reporter")
+ private String reporter = "";
+
+ @FieldInfo(name = "returnDate", type = "date", explain = "到岗时间")
+ @TableField("returnDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date returnDate;
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
index db21a3d..438ea29 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
@@ -1,228 +1,232 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
- import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.math.BigDecimal;
+
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpOccupational
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工伤案件数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:24
-* @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
+ */
@Data
@TableName("t_emp_occupational")
-public class EmpOccupational {
+public class EmpOccupational implements Serializable {
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ private static final long serialVersionUID = 5704201515491620531L;
+ @FieldInfo(name = "occupationalId", type = "bigint", explain = "案件Id")
+ @TableField("occupationalId")
+ private Long occupationalId = 0L;
- /**
- * 案件Id
- */
- @TableField("occupationalId")
- private Long occupationalId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- *
- */
- @TableField("injuredTime")
- private Date injuredTime;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 受伤地点
- */
- @TableField("injuredAddress")
- private String injuredAddress;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 受伤部位
- */
- @TableField("injuredPart")
- private String injuredPart;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- *
- */
- @TableField("injuredDiacrisis")
- private String injuredDiacrisis;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 受伤经过描述
- */
- @TableField("injuredDescribe")
- private String injuredDescribe;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 就诊医院
- */
- @TableField("hospitalName")
- private String hospitalName;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 就诊科室
- */
- @TableField("treatmentName")
- private String treatmentName;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 是否住院
- */
- @TableField("hospitalizatioFlag")
- private Integer hospitalizatioFlag;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
- /**
- * 床号
- */
- @TableField("bedNumb")
- private Byte bedNumb;
+ @FieldInfo(name = "injuredTime", type = "datetime", explain = "")
+ @TableField("injuredTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date injuredTime;
- /**
- * 报案时间
- */
- @TableField("reprotTime")
- private Date reprotTime;
+ @FieldInfo(name = "injuredAddress", type = "varchar", explain = "受伤地点")
+ @TableField("injuredAddress")
+ private String injuredAddress = "";
- /**
- *
- */
- @TableField("submitTime")
- private Date submitTime;
+ @FieldInfo(name = "injuredPart", type = "varchar", explain = "受伤部位")
+ @TableField("injuredPart")
+ private String injuredPart = "";
- /**
- * 递交人
- */
- @TableField("sbumitBy")
- private String sbumitBy;
+ @FieldInfo(name = "injuredDiacrisis", type = "varchar", explain = "")
+ @TableField("injuredDiacrisis")
+ private String injuredDiacrisis = "";
- /**
- * 人事处理时间
- */
- @TableField("hrDoDate")
- private Date hrDoDate;
+ @FieldInfo(name = "injuredDescribe", type = "varchar", explain = "受伤经过描述")
+ @TableField("injuredDescribe")
+ private String injuredDescribe = "";
- /**
- * 医疗总费用
- */
- @TableField("expensesFee")
- private BigDecimal expensesFee;
- /**
- * 剔除总额
- */
- @TableField("eliminate")
- private BigDecimal eliminate;
- /**
- * 一次性伤残补助金
- */
- @TableField("socialDisability")
- private BigDecimal socialDisability;
- /**
- * 住院伙食补贴
- */
- @TableField("socialAllowance")
- private BigDecimal socialAllowance;
- /**
- * 一次性医疗补助金
- */
- @TableField("socialSubsidy")
- private BigDecimal socialSubsidy;
- /**
- * 社保赔偿总费用
- */
- @TableField("socialCompensation")
- private BigDecimal socialCompensation;
- /**
- * 已赔付医药费用
- */
- @TableField("compensated")
- private BigDecimal compensated;
- /**
- * 其他赔偿报销
- */
- @TableField("otherCompensated")
- private BigDecimal otherCompensated;
- /**
- *
- */
- @TableField("companylDisability")
- private BigDecimal companylDisability;
- /**
- * 工伤生活补贴
- */
- @TableField("companyAllowance")
- private BigDecimal companyAllowance;
- /**
- * 公司一次性医疗补助金
- */
- @TableField("companySubsidy")
- private BigDecimal companySubsidy;
- /**
- * 公司赔偿总费用
- */
- @TableField("companyCompensation")
- private BigDecimal companyCompensation;
- /**
- * 公司一次性就业补助金
- */
- @TableField("jobSubsidy")
- private BigDecimal jobSubsidy;
- /**
- * 结案状态 0-未结案 1-已结案
- */
- @TableField("settleStatus")
- private Integer settleStatus;
+ @FieldInfo(name = "hospitalName", type = "varchar", explain = "就诊医院")
+ @TableField("hospitalName")
+ private String hospitalName = "";
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "treatmentName", type = "varchar", explain = "就诊科室")
+ @TableField("treatmentName")
+ private String treatmentName = "";
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "hospitalizatioFlag", type = "bit", explain = "是否住院")
+ @TableField("hospitalizatioFlag")
+ private Integer hospitalizatioFlag = 0;
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
+ @TableField("bedNumb")
+ private Integer bedNumb = 0;
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "reprotTime", type = "date", explain = "报案时间")
+ @TableField("reprotTime")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date reprotTime;
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "submitTime", type = "datetime", explain = "")
+ @TableField("submitTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date submitTime;
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "sbumitBy", type = "varchar", explain = "递交人")
+ @TableField("sbumitBy")
+ private String sbumitBy = "";
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "hrDoDate", type = "date", explain = "人事处理时间")
+ @TableField("hrDoDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date hrDoDate;
+
+ @FieldInfo(name = "expensesFee", type = "decimal", explain = "医疗总费用")
+ @TableField("expensesFee")
+ private BigDecimal expensesFee = BigDecimal.ZERO;
+
+ @FieldInfo(name = "eliminate", type = "decimal", explain = "剔除总额")
+ @TableField("eliminate")
+ private BigDecimal eliminate = BigDecimal.ZERO;
+
+ @FieldInfo(name = "socialDisability", type = "decimal", explain = "一次性伤残补助金")
+ @TableField("socialDisability")
+ private BigDecimal socialDisability = BigDecimal.ZERO;
+
+ @FieldInfo(name = "socialAllowance", type = "decimal", explain = "住院伙食补贴")
+ @TableField("socialAllowance")
+ private BigDecimal socialAllowance = BigDecimal.ZERO;
+
+ @FieldInfo(name = "socialSubsidy", type = "decimal", explain = "一次性医疗补助金")
+ @TableField("socialSubsidy")
+ private BigDecimal socialSubsidy = BigDecimal.ZERO;
+
+ @FieldInfo(name = "socialCompensation", type = "decimal", explain = "社保赔偿总费用")
+ @TableField("socialCompensation")
+ private BigDecimal socialCompensation = BigDecimal.ZERO;
+
+ @FieldInfo(name = "compensated", type = "decimal", explain = "已赔付医药费用")
+ @TableField("compensated")
+ private BigDecimal compensated = BigDecimal.ZERO;
+
+ @FieldInfo(name = "otherCompensated", type = "decimal", explain = "其他赔偿报销")
+ @TableField("otherCompensated")
+ private BigDecimal otherCompensated = BigDecimal.ZERO;
+
+ @FieldInfo(name = "companylDisability", type = "decimal", explain = "")
+ @TableField("companylDisability")
+ private BigDecimal companylDisability = BigDecimal.ZERO;
+
+ @FieldInfo(name = "companyAllowance", type = "decimal", explain = "工伤生活补贴")
+ @TableField("companyAllowance")
+ private BigDecimal companyAllowance = BigDecimal.ZERO;
+
+ @FieldInfo(name = "companySubsidy", type = "decimal", explain = "公司一次性医疗补助金")
+ @TableField("companySubsidy")
+ private BigDecimal companySubsidy = BigDecimal.ZERO;
+
+ @FieldInfo(name = "companyCompensation", type = "decimal", explain = "公司赔偿总费用")
+ @TableField("companyCompensation")
+ private BigDecimal companyCompensation = BigDecimal.ZERO;
+
+ @FieldInfo(name = "jobSubsidy", type = "decimal", explain = "公司一次性就业补助金")
+ @TableField("jobSubsidy")
+ private BigDecimal jobSubsidy = BigDecimal.ZERO;
+
+ @FieldInfo(name = "settleStatus", type = "bit", explain = "结案状态 0-未结案 1-已结案")
+ @TableField("settleStatus")
+ private Integer settleStatus = 0;
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
index 9942781..65d3e3c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpRemarkInfo.java
@@ -1,84 +1,116 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpRemarkinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工备注信息数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:15
-* @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
+ */
@Data
@TableName("t_emp_remarkinfo")
-public class EmpRemarkInfo {
+public class EmpRemarkInfo implements Serializable {
- /**
- * 备注Id
- */
- @TableId(value = "remarkId", type = IdType.AUTO)
- private Long remarkId;
+ private static final long serialVersionUID = 3084540653935731579L;
+ @FieldInfo(name = "remarkId", type = "bigint", explain = "备注Id")
+ @TableId(value = "remarkId")
+ private Long remarkId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 备注内容
- */
- @TableField("remarkContent")
- private String remarkContent;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 备注日期
- */
- @TableField("remarkDate")
- private Date remarkDate;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
+
+ @FieldInfo(name = "remarkContent", type = "varchar", explain = "备注内容")
+ @TableField("remarkContent")
+ private String remarkContent = "";
+
+ @FieldInfo(name = "remarkDate", type = "date", explain = "备注日期")
+ @TableField("remarkDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date remarkDate;
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
}
\ No newline at end of file
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
index 6075269..235f8fe 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
@@ -1,96 +1,124 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
/**
-*
-* name:EmpResign
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工辞职申请数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:08
-* @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
+ */
@Data
@TableName("t_emp_resign")
-public class EmpResign {
+public class EmpResign implements Serializable {
- /**
- * 辞职Id
- */
- @TableId(value = "resignId", type = IdType.AUTO)
- private Long resignId;
+ private static final long serialVersionUID = -4692256235815402125L;
+ @FieldInfo(name = "resignId", type = "bigint", explain = "辞职Id")
+ @TableId(value = "resignId")
+ private Long resignId = 0L;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId = 0L;
- /**
- * 申请日期
- */
- @TableField("applayDate")
- private Date applayDate;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ private String empNumb = "";
- /**
- * 报备人
- */
- @TableField("reporter")
- private String reporter;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ private String empName = "";
- /**
- * 事由
- */
- @TableField("reason")
- private String reason;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ private String sex = "";
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ private String certificateNumb = "";
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ private String deptName = "";
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ private String jobName = "";
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
+ @TableField("applayDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date applayDate;
- /**
- * 备注
- */
- @TableField("remark")
- private String remark;
+ @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+ @TableField("reporter")
+ private String reporter = "";
+
+ @FieldInfo(name = "reason", type = "varchar", explain = "事由")
+ @TableField("reason")
+ private String reason = "";
+
+ @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ @TableField("createTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ @TableField("creator")
+ private String creator = "";
+
+ @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ @TableField("modifyTime")
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ @TableField("modifier")
+ private String modifier = "";
+
+ @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ @TableField("delFlag")
+ private Integer delFlag = 0;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version = 0;
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ private String remark = "";
}
\ No newline at end of file
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 2041a9d..c1bf82d 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:员工意外险案件实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:36:10
+* @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);
+}
\ 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 a7b6c81..15a02a4 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,34 +8,35 @@
import java.util.List;
/**
- * name:EmpBadrecord
- * package:cc.mrbird.febs.server.hr.controller
- * description:员工不良记录信息实体Mapper
- *
- * @author luoyibo
- * @date 2021-01-24 20:35:55
- * @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 2021-01-28 10:32
- * @author: luoyibo
- * @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批量逻辑删除记录
+*
+* 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);
+}
\ 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 83495c5..a035d5f 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:员工合同信息实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:35:42
+* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
public interface EmpContractInfoMapper extends BaseMapper<EmpContractInfo> {
-
-}
+/**
+*
+* 根据Id批量逻辑删除记录
+*
+* 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 = 1,\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>")
+void logicDeleteByIds(@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 1a51815..d00356e 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:离职当月考勤实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:35:38
+* @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);
+}
\ 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 07f8aa6..2fd08ae 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:员工社保申请实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:35:33
+* @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);
+}
\ 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 81cb51d..904b9da 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:员工劳资案件实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:35:59
+* @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" +
+ " \n" +
+ " </foreach>\n" +
+ "</script>")
+void logicDeleteByIds(@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 20bd663..d5cfb9e 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:员工请假记录实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:35:29
+* @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);
+}
\ 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 1a40c32..f79ec94 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:员工工伤案件实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:35:24
+* @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);
+}
\ 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 a5e5b4e..2cef382 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:员工备注信息实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:35:15
+* @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);
+}
\ 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 5c1e03d..5015127 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
@@ -2,6 +2,10 @@
import cc.mrbird.febs.server.hr.entity.EmpResign;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
/**
*
@@ -10,9 +14,29 @@
* description:员工辞职申请实体Mapper
*
* @author luoyibo
-* @date 2021-01-24 20:35:08
+* @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);
+}
\ 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 67d73b7..857fb39 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
@@ -15,7 +15,7 @@
* description:员工意外险案件服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:36:10
+* @date 2021-01-31 11:26:27
* @since JDK1.8
*/
public interface IEmpAccidentCasesService extends IService<EmpAccidentCases> {
@@ -56,4 +56,15 @@
* @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);
}
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 5e34081..0682846 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,60 +9,62 @@
import java.util.List;
/**
- * name:EmpBadrecord
- * package:cc.mrbird.febs.server.hr.controller
- * description:员工不良记录信息服务接口
- *
- * @author luoyibo
- * @date 2021-01-24 20:35:55
- * @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);
- /**
- *
- * 根据Id批量逻辑删除记录
- *
- * date 2021-01-28 10:48
- * @author: luoyibo
- * @param ids 待删除Id
- * @return void
- */
- void logicDelEmpBadRecord(String ids);
+/**
+* 删除
+*
+* @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);
}
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 c5d34aa..303de62 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
@@ -15,7 +15,7 @@
* description:员工合同信息服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:35:42
+* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
public interface IEmpContractInfoService extends IService<EmpContractInfo> {
@@ -56,4 +56,15 @@
* @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);
}
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 1c78a30..001e225 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
@@ -15,7 +15,7 @@
* description:离职当月考勤服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:35:38
+* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
public interface IEmpDimissionAttendService extends IService<EmpDimissionAttend> {
@@ -56,4 +56,15 @@
* @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);
}
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 52dcf09..7a0542e 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
@@ -15,7 +15,7 @@
* description:员工社保申请服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:35:33
+* @date 2021-01-31 11:26:23
* @since JDK1.8
*/
public interface IEmpInsuranceService extends IService<EmpInsurance> {
@@ -56,4 +56,15 @@
* @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);
}
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 bafb12d..e4ebbaa 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
@@ -15,7 +15,7 @@
* description:员工劳资案件服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:35:59
+* @date 2021-01-31 11:26:36
* @since JDK1.8
*/
public interface IEmpLaborTroubleService extends IService<EmpLaborTrouble> {
@@ -56,4 +56,15 @@
* @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);
}
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 61a02ed..70b83cc 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
@@ -15,7 +15,7 @@
* description:员工请假记录服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:35:29
+* @date 2021-01-31 11:26:13
* @since JDK1.8
*/
public interface IEmpLeaveInfoService extends IService<EmpLeaveInfo> {
@@ -56,4 +56,15 @@
* @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);
}
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 5446724..48c09d6 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
@@ -15,7 +15,7 @@
* description:员工工伤案件服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:35:24
+* @date 2021-01-31 11:26:32
* @since JDK1.8
*/
public interface IEmpOccupationalService extends IService<EmpOccupational> {
@@ -56,4 +56,15 @@
* @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);
}
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 4e0e72a..8644b0d 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
@@ -15,10 +15,10 @@
* description:员工备注信息服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:35:15
+* @date 2021-01-31 11:26:48
* @since JDK1.8
*/
-public interface IEmpRemarkInfoService extends IService<EmpRemarkInfo> {
+public interface IEmpRemarkinfoService extends IService<EmpRemarkInfo> {
/**
* 查询（分页）
*
@@ -56,4 +56,15 @@
* @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);
}
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 37aa947..d24cbb3 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
@@ -15,7 +15,7 @@
* description:员工辞职申请服务接口
*
* @author luoyibo
-* @date 2021-01-24 20:35:08
+* @date 2021-01-31 11:26:18
* @since JDK1.8
*/
public interface IEmpResignService extends IService<EmpResign> {
@@ -56,4 +56,15 @@
* @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);
}
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 31d21b6..8f50d00 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.mapper.EmpAccidentCasesMapper;
import cc.mrbird.febs.server.hr.service.IEmpAccidentCasesService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpAccidentcases
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工意外险案件服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:36:10
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpAccidentCasesServiceImpl extends ServiceImpl
-<EmpAccidentCasesMapper, EmpAccidentCases> implements IEmpAccidentCasesService {
+class EmpAccidentCasesServiceImpl extends ServiceImpl<EmpAccidentCasesMapper, EmpAccidentCases> implements IEmpAccidentCasesService {
-private final EmpAccidentCasesMapper empAccidentcasesMapper;
+ private final EmpAccidentCasesMapper empAccidentcasesMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
-LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpAccidentCases> findEmpAccidentcasess(QueryRequest request, EmpAccidentCases empAccidentcases) {
+ LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpAccidentCases::getDelFlag, 0);
+ Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
-LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpAccidentCases> findEmpAccidentcasess(EmpAccidentCases empAccidentcases) {
+ LambdaQueryWrapper<EmpAccidentCases> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpAccidentCases::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) {
-this.save(empAccidentcases);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) {
+ empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empAccidentcases.setCreator(operatorId);
+ empAccidentcases.setModifier(operatorId);
+ this.save(empAccidentcases);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) {
-this.saveOrUpdate(empAccidentcases);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) {
+ EmpAccidentCases dbData = this.getById(empAccidentcases.getAccidentId());
+ empAccidentcases.setCreateTime(dbData.getCreateTime());
+ empAccidentcases.setCreator(dbData.getCreator());
+ empAccidentcases.setDelFlag(dbData.getDelFlag());
+ empAccidentcases.setModifyTime(new Date());
+ empAccidentcases.setModifier(operatorId);
+ this.saveOrUpdate(empAccidentcases);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases) {
-LambdaQueryWrapper<EmpAccidentCases> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpAccidentcases(EmpAccidentCases empAccidentcases) {
+ LambdaQueryWrapper<EmpAccidentCases> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpAccidentcases(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empAccidentcasesMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ 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 9a462a9..a258298 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
@@ -1,12 +1,9 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
-import cc.mrbird.febs.common.core.utils.FebsUtil;
-import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
import cc.mrbird.febs.server.hr.service.IEmpBadRecordService;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -16,6 +13,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
import java.util.*;
@@ -25,13 +24,13 @@
* description:员工不良记录信息服务接口实现
*
* @author luoyibo
- * @date 2021-01-24 20:35:55
+ * @date 2021-01-31 11:26:42
* @since JDK1.8
*/
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
+class EmpBadRecordServiceImpl extends ServiceImpl<EmpBadRecordMapper, EmpBadRecord> implements IEmpBadRecordService {
private final EmpBadRecordMapper empBadrecordMapper;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
@@ -39,25 +38,23 @@
.orElse("1");
@Override
- public IPage<EmpBadRecord> findEmpBadRecords(QueryRequest request, EmpBadRecord empBadrecord) {
+ public IPage<EmpBadRecord> findEmpBadrecords(QueryRequest request, EmpBadRecord empBadrecord) {
LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpBadRecord::getDelFlag, 0);
-
Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@Override
- public List<EmpBadRecord> findEmpBadRecords(EmpBadRecord empBadrecord) {
+ public List<EmpBadRecord> findEmpBadrecords(EmpBadRecord empBadrecord) {
LambdaQueryWrapper<EmpBadRecord> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EmpBadRecord::getDelFlag, 0);
-
return this.baseMapper.selectList(queryWrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpBadRecord(EmpBadRecord empBadrecord) {
+ public void createEmpBadrecord(EmpBadRecord empBadrecord) {
empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empBadrecord.setCreator(operatorId);
empBadrecord.setModifier(operatorId);
@@ -66,35 +63,38 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpBadRecord(EmpBadRecord empBadrecord) {
+ public void updateEmpBadrecord(EmpBadRecord empBadrecord) {
EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
empBadrecord.setCreateTime(dbData.getCreateTime());
empBadrecord.setCreator(dbData.getCreator());
empBadrecord.setDelFlag(dbData.getDelFlag());
empBadrecord.setModifyTime(new Date());
empBadrecord.setModifier(operatorId);
-
this.saveOrUpdate(empBadrecord);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public void deleteEmpBadRecord(EmpBadRecord empBadrecord) {
- UpdateWrapper<EmpBadRecord> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("delFlag", 1);
- updateWrapper.set("modifyTime", new Date());
- updateWrapper.set("modifier", operatorId);
- updateWrapper.set("version", empBadrecord.getVersion() + 1);
-
- updateWrapper.eq("badId", empBadrecord.getBadId());
- this.update(updateWrapper);
+ public void deleteEmpBadrecord(EmpBadRecord empBadrecord) {
+ LambdaQueryWrapper<EmpBadRecord> wrapper = new LambdaQueryWrapper<>();
+// TODO 设置删除条件
+ this.remove(wrapper);
}
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
@Override
- public void logicDelEmpBadRecord(String ids) {
- List<String> list = new ArrayList<>();
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpBadrecord(String ids) {
String[] str = ids.split(",");
- list.addAll(Arrays.asList(str));
+ List<String> list = new ArrayList<>(Arrays.asList(str));
empBadrecordMapper.logicDeleteByIds(list, operatorId);
}
-}
+}
\ 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 359775f..4900ebc 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
import cc.mrbird.febs.server.hr.mapper.EmpContractInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpContractinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工合同信息服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:42
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpContractInfoServiceImpl extends ServiceImpl
-<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {
+class EmpContractInfoServiceImpl extends ServiceImpl<EmpContractInfoMapper, EmpContractInfo> implements IEmpContractInfoService {
-private final EmpContractInfoMapper empContractinfoMapper;
+ private final EmpContractInfoMapper empContractinfoMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
-LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpContractInfo> findEmpContractinfos(QueryRequest request, EmpContractInfo empContractinfo) {
+ LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpContractInfo::getDelFlag, 0);
+ Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo) {
-LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpContractInfo> findEmpContractinfos(EmpContractInfo empContractinfo) {
+ LambdaQueryWrapper<EmpContractInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpContractInfo::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpContractinfo(EmpContractInfo empContractinfo) {
-this.save(empContractinfo);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpContractinfo(EmpContractInfo empContractinfo) {
+ empContractinfo.setContractId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empContractinfo.setCreator(operatorId);
+ empContractinfo.setModifier(operatorId);
+ this.save(empContractinfo);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpContractinfo(EmpContractInfo empContractinfo) {
-this.saveOrUpdate(empContractinfo);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpContractinfo(EmpContractInfo empContractinfo) {
+ EmpContractInfo dbData = this.getById(empContractinfo.getContractId());
+ empContractinfo.setCreateTime(dbData.getCreateTime());
+ empContractinfo.setCreator(dbData.getCreator());
+ empContractinfo.setDelFlag(dbData.getDelFlag());
+ empContractinfo.setModifyTime(new Date());
+ empContractinfo.setModifier(operatorId);
+ this.saveOrUpdate(empContractinfo);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpContractinfo(EmpContractInfo empContractinfo) {
-LambdaQueryWrapper<EmpContractInfo> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpContractinfo(EmpContractInfo empContractinfo) {
+ LambdaQueryWrapper<EmpContractInfo> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpContractinfo(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empContractinfoMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ 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 476ca0c..45bbdee 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.mapper.EmpDimissionAttendMapper;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpDimissionattend
-* package:cc.mrbird.febs.server.hr.controller
-* description:离职当月考勤服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:38
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpDimissionAttendServiceImpl extends ServiceImpl
-<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {
+class EmpDimissionAttendServiceImpl extends ServiceImpl<EmpDimissionAttendMapper, EmpDimissionAttend> implements IEmpDimissionAttendService {
-private final EmpDimissionAttendMapper empDimissionattendMapper;
+ private final EmpDimissionAttendMapper empDimissionattendMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
-LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpDimissionAttend> findEmpDimissionattends(QueryRequest request, EmpDimissionAttend empDimissionattend) {
+ LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
+ Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
-LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpDimissionAttend> findEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
+ LambdaQueryWrapper<EmpDimissionAttend> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpDimissionAttend::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
-this.save(empDimissionattend);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
+ empDimissionattend.setDimissionAttendId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empDimissionattend.setCreator(operatorId);
+ empDimissionattend.setModifier(operatorId);
+ this.save(empDimissionattend);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
-this.saveOrUpdate(empDimissionattend);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
+ EmpDimissionAttend dbData = this.getById(empDimissionattend.getDimissionAttendId());
+ empDimissionattend.setCreateTime(dbData.getCreateTime());
+ empDimissionattend.setCreator(dbData.getCreator());
+ empDimissionattend.setDelFlag(dbData.getDelFlag());
+ empDimissionattend.setModifyTime(new Date());
+ empDimissionattend.setModifier(operatorId);
+ this.saveOrUpdate(empDimissionattend);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
-LambdaQueryWrapper<EmpDimissionAttend> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) {
+ LambdaQueryWrapper<EmpDimissionAttend> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpDimissionattend(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empDimissionattendMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ 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 8ea0a77..6fa1039 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.mapper.EmpInsuranceMapper;
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpInsurance
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工社保申请服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:33
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpInsuranceServiceImpl extends ServiceImpl
-<EmpInsuranceMapper, EmpInsurance> implements IEmpInsuranceService {
+class EmpInsuranceServiceImpl extends ServiceImpl<EmpInsuranceMapper, EmpInsurance> implements IEmpInsuranceService {
-private final EmpInsuranceMapper empInsuranceMapper;
+ private final EmpInsuranceMapper empInsuranceMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
-LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpInsurance> findEmpInsurances(QueryRequest request, EmpInsurance empInsurance) {
+ LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpInsurance::getDelFlag, 0);
+ Page<EmpInsurance> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance) {
-LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpInsurance> findEmpInsurances(EmpInsurance empInsurance) {
+ LambdaQueryWrapper<EmpInsurance> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpInsurance::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpInsurance(EmpInsurance empInsurance) {
-this.save(empInsurance);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpInsurance(EmpInsurance empInsurance) {
+ empInsurance.setInsuranceId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empInsurance.setCreator(operatorId);
+ empInsurance.setModifier(operatorId);
+ this.save(empInsurance);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpInsurance(EmpInsurance empInsurance) {
-this.saveOrUpdate(empInsurance);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpInsurance(EmpInsurance empInsurance) {
+ EmpInsurance dbData = this.getById(empInsurance.getInsuranceId());
+ empInsurance.setCreateTime(dbData.getCreateTime());
+ empInsurance.setCreator(dbData.getCreator());
+ empInsurance.setDelFlag(dbData.getDelFlag());
+ empInsurance.setModifyTime(new Date());
+ empInsurance.setModifier(operatorId);
+ this.saveOrUpdate(empInsurance);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpInsurance(EmpInsurance empInsurance) {
-LambdaQueryWrapper<EmpInsurance> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpInsurance(EmpInsurance empInsurance) {
+ LambdaQueryWrapper<EmpInsurance> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpInsurance(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empInsuranceMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ 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 025c51a..be36aef 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpLabortrouble
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工劳资案件服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:59
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpLaborTroubleServiceImpl extends ServiceImpl
-<EmpLaborTroubleMapper, EmpLaborTrouble> implements IEmpLaborTroubleService {
+class EmpLaborTroubleServiceImpl extends ServiceImpl<EmpLaborTroubleMapper, EmpLaborTrouble> implements IEmpLaborTroubleService {
-private final EmpLaborTroubleMapper empLabortroubleMapper;
+ private final EmpLaborTroubleMapper empLabortroubleMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
-LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpLaborTrouble> findEmpLabortroubles(QueryRequest request, EmpLaborTrouble empLabortrouble) {
+ LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpLaborTrouble::getDelFlag, 0);
+ Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
-LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
+ LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpLaborTrouble::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
-this.save(empLabortrouble);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
+ empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empLabortrouble.setCreator(operatorId);
+ empLabortrouble.setModifier(operatorId);
+ this.save(empLabortrouble);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
-this.saveOrUpdate(empLabortrouble);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
+ EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
+ empLabortrouble.setCreateTime(dbData.getCreateTime());
+ empLabortrouble.setCreator(dbData.getCreator());
+ empLabortrouble.setDelFlag(dbData.getDelFlag());
+ empLabortrouble.setModifyTime(new Date());
+ empLabortrouble.setModifier(operatorId);
+ this.saveOrUpdate(empLabortrouble);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
-LambdaQueryWrapper<EmpLaborTrouble> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
+ LambdaQueryWrapper<EmpLaborTrouble> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpLabortrouble(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empLabortroubleMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ 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 f9ad375..870adfb 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.mapper.EmpLeaveInfoMapper;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpLeaveinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工请假记录服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:29
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpLeaveInfoServiceImpl extends ServiceImpl
-<EmpLeaveInfoMapper, EmpLeaveInfo> implements IEmpLeaveInfoService {
+class EmpLeaveInfoServiceImpl extends ServiceImpl<EmpLeaveInfoMapper, EmpLeaveInfo> implements IEmpLeaveInfoService {
-private final EmpLeaveInfoMapper empLeaveinfoMapper;
+ private final EmpLeaveInfoMapper empLeaveinfoMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpLeaveInfo> findEmpLeaveinfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
-LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpLeaveInfo> findEmpLeaveinfos(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
+ LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
+ Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpLeaveInfo> findEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
-LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpLeaveInfo> findEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
+ LambdaQueryWrapper<EmpLeaveInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpLeaveInfo::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
-this.save(empLeaveinfo);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
+ empLeaveinfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empLeaveinfo.setCreator(operatorId);
+ empLeaveinfo.setModifier(operatorId);
+ this.save(empLeaveinfo);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
-this.saveOrUpdate(empLeaveinfo);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
+ EmpLeaveInfo dbData = this.getById(empLeaveinfo.getLeaveId());
+ empLeaveinfo.setCreateTime(dbData.getCreateTime());
+ empLeaveinfo.setCreator(dbData.getCreator());
+ empLeaveinfo.setDelFlag(dbData.getDelFlag());
+ empLeaveinfo.setModifyTime(new Date());
+ empLeaveinfo.setModifier(operatorId);
+ this.saveOrUpdate(empLeaveinfo);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
-LambdaQueryWrapper<EmpLeaveInfo> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) {
+ LambdaQueryWrapper<EmpLeaveInfo> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpLeaveinfo(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empLeaveinfoMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ 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 1d77baf..e9ed8b6 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.mapper.EmpOccupationalMapper;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpOccupational
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工伤案件服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:24
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpOccupationalServiceImpl extends ServiceImpl
-<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
+class EmpOccupationalServiceImpl extends ServiceImpl<EmpOccupationalMapper, EmpOccupational> implements IEmpOccupationalService {
-private final EmpOccupationalMapper empOccupationalMapper;
+ private final EmpOccupationalMapper empOccupationalMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpOccupational> findEmpOccupationals(QueryRequest request, EmpOccupational empOccupational) {
+ LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpOccupational::getDelFlag, 0);
+ Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
+ LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpOccupational::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpOccupational(EmpOccupational empOccupational) {
-this.save(empOccupational);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpOccupational(EmpOccupational empOccupational) {
+ empOccupational.setOccupationalId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empOccupational.setCreator(operatorId);
+ empOccupational.setModifier(operatorId);
+ this.save(empOccupational);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpOccupational(EmpOccupational empOccupational) {
-this.saveOrUpdate(empOccupational);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpOccupational(EmpOccupational empOccupational) {
+ EmpOccupational dbData = this.getById(empOccupational.getOccupationalId());
+ empOccupational.setCreateTime(dbData.getCreateTime());
+ empOccupational.setCreator(dbData.getCreator());
+ empOccupational.setDelFlag(dbData.getDelFlag());
+ empOccupational.setModifyTime(new Date());
+ empOccupational.setModifier(operatorId);
+ this.saveOrUpdate(empOccupational);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpOccupational(EmpOccupational empOccupational) {
-LambdaQueryWrapper<EmpOccupational> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpOccupational(EmpOccupational empOccupational) {
+ LambdaQueryWrapper<EmpOccupational> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpOccupational(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empOccupationalMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ 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 8e45736..0fbe628 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
@@ -1,8 +1,9 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.mapper.EmpRemarkInfoMapper;
-import cc.mrbird.febs.server.hr.service.IEmpRemarkInfoService;
+import cc.mrbird.febs.server.hr.service.IEmpRemarkinfoService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpRemarkinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工备注信息服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:15
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpRemarkInfoServiceImpl extends ServiceImpl
-<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkInfoService {
+class EmpRemarkInfoServiceImpl extends ServiceImpl<EmpRemarkInfoMapper, EmpRemarkInfo> implements IEmpRemarkinfoService {
-private final EmpRemarkInfoMapper empRemarkinfoMapper;
+ private final EmpRemarkInfoMapper empRemarkinfoMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
-LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpRemarkInfo> findEmpRemarkinfos(QueryRequest request, EmpRemarkInfo empRemarkinfo) {
+ LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
+ Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
-LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpRemarkInfo> findEmpRemarkinfos(EmpRemarkInfo empRemarkinfo) {
+ LambdaQueryWrapper<EmpRemarkInfo> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpRemarkInfo::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
-this.save(empRemarkinfo);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
+ empRemarkinfo.setRemarkId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empRemarkinfo.setCreator(operatorId);
+ empRemarkinfo.setModifier(operatorId);
+ this.save(empRemarkinfo);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
-this.saveOrUpdate(empRemarkinfo);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
+ EmpRemarkInfo dbData = this.getById(empRemarkinfo.getRemarkId());
+ empRemarkinfo.setCreateTime(dbData.getCreateTime());
+ empRemarkinfo.setCreator(dbData.getCreator());
+ empRemarkinfo.setDelFlag(dbData.getDelFlag());
+ empRemarkinfo.setModifyTime(new Date());
+ empRemarkinfo.setModifier(operatorId);
+ this.saveOrUpdate(empRemarkinfo);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
-LambdaQueryWrapper<EmpRemarkInfo> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpRemarkinfo(EmpRemarkInfo empRemarkinfo) {
+ LambdaQueryWrapper<EmpRemarkInfo> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpRemarkinfo(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empRemarkinfoMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ 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 b02aa3b..ce302be 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service.impl;
+import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
@@ -12,59 +13,88 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
-import java.util.List;
+import java.util.*;
/**
-*
-* name:EmpResign
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工辞职申请服务接口实现
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:08
-* @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
+ */
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
-public class EmpResignServiceImpl extends ServiceImpl
-<EmpResignMapper, EmpResign> implements IEmpResignService {
+class EmpResignServiceImpl extends ServiceImpl<EmpResignMapper, EmpResign> implements IEmpResignService {
-private final EmpResignMapper empResignMapper;
+ private final EmpResignMapper empResignMapper;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
-@Override
-public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
-LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
-return this.page(page, queryWrapper);
-}
+ @Override
+ public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
+ LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpResign::getDelFlag, 0);
+ Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return this.page(page, queryWrapper);
+ }
-@Override
-public List<EmpResign> findEmpResigns(EmpResign empResign) {
-LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
-// TODO 设置查询条件
-return this.baseMapper.selectList(queryWrapper);
-}
+ @Override
+ public List<EmpResign> findEmpResigns(EmpResign empResign) {
+ LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EmpResign::getDelFlag, 0);
+ return this.baseMapper.selectList(queryWrapper);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void createEmpResign(EmpResign empResign) {
-this.save(empResign);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createEmpResign(EmpResign empResign) {
+ empResign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ empResign.setCreator(operatorId);
+ empResign.setModifier(operatorId);
+ this.save(empResign);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void updateEmpResign(EmpResign empResign) {
-this.saveOrUpdate(empResign);
-}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateEmpResign(EmpResign empResign) {
+ EmpResign dbData = this.getById(empResign.getResignId());
+ empResign.setCreateTime(dbData.getCreateTime());
+ empResign.setCreator(dbData.getCreator());
+ empResign.setDelFlag(dbData.getDelFlag());
+ empResign.setModifyTime(new Date());
+ empResign.setModifier(operatorId);
+ this.saveOrUpdate(empResign);
+ }
-@Override
-@Transactional(rollbackFor = Exception.class)
-public void deleteEmpResign(EmpResign empResign) {
-LambdaQueryWrapper<EmpResign> wapper = new LambdaQueryWrapper<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteEmpResign(EmpResign empResign) {
+ LambdaQueryWrapper<EmpResign> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
-this.remove(wapper);
-}
-}
+ this.remove(wrapper);
+ }
+
+ /**
+ * 根据Id批量逻辑删除记录
+ * <p>
+ * date 2021-01-28 10:48
+ *
+ * @param ids 待删除Id
+ * @return void
+ * @author: luoyibo
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void logicDelEmpResign(String ids) {
+ String[] str = ids.split(",");
+ List<String> list = new ArrayList<>(Arrays.asList(str));
+ empResignMapper.logicDeleteByIds(list, operatorId);
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0