From 79cdcc2167df9e04b24e2d48a0e71e0a883daa7c Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期六, 27 二月 2021 03:35:21 +0800
Subject: [PATCH] 修改bug
---
febs-auth/src/main/resources/mapper/UserMapper.xml | 2
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpResignService.java | 5
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java | 26 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBadRecordService.java | 5
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IUserService.java | 17 +
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java | 30 ++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccidentCasesController.java | 135 +++++-----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 23 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java | 5
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java | 4
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java | 23 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpLaborTroubleService.java | 5
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.java | 135 +++++-----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java | 23 +
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/UserController.java | 9
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java | 135 +++++-----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpAccidentCasesService.java | 5
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java | 135 +++++-----
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 23 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java | 20 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 7
febs-server/febs-server-hr/src/main/resources/bootstrap.yml | 2
23 files changed, 466 insertions(+), 312 deletions(-)
diff --git a/febs-auth/src/main/resources/mapper/UserMapper.xml b/febs-auth/src/main/resources/mapper/UserMapper.xml
index 6ce8e3f..f4d2d30 100644
--- a/febs-auth/src/main/resources/mapper/UserMapper.xml
+++ b/febs-auth/src/main/resources/mapper/UserMapper.xml
@@ -24,7 +24,7 @@
LEFT JOIN t_dept d ON (u.dept_id = d.dept_id)
LEFT JOIN t_user_role ur ON (u.user_id = ur.user_id)
LEFT JOIN t_role r ON r.role_id = ur.role_id
- WHERE u.username = #{username}
+ WHERE u.username = #{username} and status = 1
group by u.username,u.user_id,u.email,u.mobile,u.password, u.status,u.create_time,u.ssex,u.dept_id
,u.last_login_time,u.modify_time,u.description,u.avatar
</select>
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 0757967..76f0750 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
@@ -25,15 +25,14 @@
import java.util.Map;
/**
-*
-* name:EmpAccidentcases
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工意外险案件控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:27
-* @since JDK1.8
-*/
+ * name:EmpAccidentcases
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工意外险案件控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:27
+ * @since JDK1.8
+ */
@Api(tags = "人员意外险案件录入接口")
@Slf4j
@Validated
@@ -42,80 +41,82 @@
@RequiredArgsConstructor
public class EmpAccidentCasesController {
-private final IEmpAccidentCasesService empAccidentCasesService;
+ private final IEmpAccidentCasesService empAccidentCasesService;
-@GetMapping
-@PreAuthorize("hasAuthority('empAccidentcases:list')")
-public FebsResponse getAllEmpAccidentCases(EmpAccidentCases empAccidentcases) {
-return new FebsResponse().data(empAccidentCasesService.findEmpAccidentcasess(empAccidentcases));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empAccidentcases:list')")
+ 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));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empAccidentcases:list')")
+ public FebsResponse empAccidentCasesList(QueryRequest request, EmpAccidentCases empAccidentcases) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empAccidentCasesService.findEmpAccidentcasess(request, empAccidentcases));
+ return new FebsResponse().data(dataTable);
+ }
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpAccidentCases empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empAccidentCasesService.count());
List<EmpAccidentCases> records = this.empAccidentCasesService.findEmpAccidentcasess(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpAccidentCases.class, response).downXlsx(records, false);
}
-@PostMapping
-@PreAuthorize("hasAuthority('empAccidentcases:add')")
-public void addEmpAccidentCases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
-try {
-this.empAccidentCasesService.createEmpAccidentcases(empAccidentcases);
-} catch (Exception e) {
-String message = "新增员工意外险案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-@DeleteMapping
-@PreAuthorize("hasAuthority('empAccidentcases:delete')")
-public void deleteEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
-try {
-this.empAccidentCasesService.deleteEmpAccidentcases(empAccidentcases);
-} catch (Exception e) {
-String message = "删除员工意外险案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empAccidentcases:add')")
+ public void addEmpAccidentCases(@Valid EmpAccidentCases empAccidentcases) throws FebsException {
+ try {
+ this.empAccidentCasesService.createEmpAccidentcases(empAccidentcases);
+ } catch (Exception e) {
+ 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);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empAccidentcases:delete')")
+ public void deleteEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
+ try {
+ this.empAccidentCasesService.deleteEmpAccidentcases(empAccidentcases);
+ } catch (Exception e) {
+ String message = "删除员工意外险案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empAccidentcases:update')")
-public void updateEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
-try {
-this.empAccidentCasesService.updateEmpAccidentcases(empAccidentcases);
-} catch (Exception e) {
-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);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empAccidentcases:update')")
+ public void updateEmpAccidentCases(EmpAccidentCases empAccidentcases) throws FebsException {
+ try {
+ this.empAccidentCasesService.updateEmpAccidentcases(empAccidentcases);
+ } catch (Exception e) {
+ String message = "修改员工意外险案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "意外险案件信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empAccidentcases:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empAccidentCasesService.momentToNormal(ids);
} catch (Exception e) {
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 96dfdee..1924b9e 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
@@ -25,15 +25,14 @@
import java.util.Map;
/**
-*
-* name:EmpBadrecord
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工不良记录信息控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:42
-* @since JDK1.8
-*/
+ * name:EmpBadrecord
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工不良记录信息控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:42
+ * @since JDK1.8
+ */
@Api(tags = "人员不良记录录入接口")
@Slf4j
@Validated
@@ -42,80 +41,82 @@
@RequiredArgsConstructor
public class EmpBadRecordController {
-private final IEmpBadRecordService empBadrecordService;
+ private final IEmpBadRecordService empBadrecordService;
-@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);
+ }
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpBadRecord empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empBadrecordService.count());
List<EmpBadRecord> records = this.empBadrecordService.findEmpBadrecords(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpBadRecord.class, response).downXlsx(records, false);
}
-@PostMapping
-@PreAuthorize("hasAuthority('empBadrecord:add')")
-public void addEmpBadrecord(@Valid EmpBadRecord empBadrecord) throws FebsException {
-try {
-this.empBadrecordService.createEmpBadrecord(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);
-}
-}
+ @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);
-}
-}
+ @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);
+ }
+ }
-@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("{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);
+ }
+ }
@ApiOperation(value = "不良记录信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empBadrecord:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empBadrecordService.momentToNormal(ids);
} catch (Exception e) {
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 9cae286..0b63f07 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
@@ -24,15 +24,14 @@
import java.util.Map;
/**
-*
-* name:EmpDimissionattend
-* package:cc.mrbird.febs.server.hr.controller
-* description:离职当月考勤控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:04
-* @since JDK1.8
-*/
+ * name:EmpDimissionattend
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:离职当月考勤控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:04
+ * @since JDK1.8
+ */
@Api(tags = "人员离职当月考勤信息录入接口")
@Slf4j
@Validated
@@ -41,80 +40,82 @@
@RequiredArgsConstructor
public class EmpDimissionAttendController {
-private final IEmpDimissionAttendService empDimissionattendService;
+ private final IEmpDimissionAttendService empDimissionattendService;
-@GetMapping
-@PreAuthorize("hasAuthority('empDimissionattend:list')")
-public FebsResponse getAllEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
-return new FebsResponse().data(empDimissionattendService.findEmpDimissionattends(empDimissionattend));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empDimissionattend:list')")
+ public FebsResponse getAllEmpDimissionattends(EmpDimissionAttend empDimissionattend) {
+ return new FebsResponse().data(empDimissionattendService.findEmpDimissionattends(empDimissionattend));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empDimissionattend:list')")
-public FebsResponse empDimissionattendList(QueryRequest request, EmpDimissionAttend empDimissionattend) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionattendService.findEmpDimissionattends(request, empDimissionattend));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empDimissionattend:list')")
+ public FebsResponse empDimissionattendList(QueryRequest request, EmpDimissionAttend empDimissionattend) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionattendService.findEmpDimissionattends(request, empDimissionattend));
+ return new FebsResponse().data(dataTable);
+ }
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpDimissionAttend empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empDimissionattendService.count());
List<EmpDimissionAttend> records = this.empDimissionattendService.findEmpDimissionattends(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpDimissionAttend.class, response).downXlsx(records, false);
}
-@PostMapping
-@PreAuthorize("hasAuthority('empDimissionattend:add')")
-public void addEmpDimissionattend(@Valid EmpDimissionAttend empDimissionattend) throws FebsException {
-try {
-this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
-} catch (Exception e) {
-String message = "新增离职当月考勤失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-@DeleteMapping
-@PreAuthorize("hasAuthority('empDimissionattend:delete')")
-public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) throws FebsException {
-try {
-this.empDimissionattendService.deleteEmpDimissionattend(empDimissionattend);
-} catch (Exception e) {
-String message = "删除离职当月考勤失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empDimissionattend:add')")
+ public void addEmpDimissionattend(@Valid EmpDimissionAttend empDimissionattend) throws FebsException {
+ try {
+ this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
+ } catch (Exception e) {
+ 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);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empDimissionattend:delete')")
+ public void deleteEmpDimissionattend(EmpDimissionAttend empDimissionattend) throws FebsException {
+ try {
+ this.empDimissionattendService.deleteEmpDimissionattend(empDimissionattend);
+ } catch (Exception e) {
+ String message = "删除离职当月考勤失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empDimissionattend:update')")
-public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) throws FebsException {
-try {
-this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
-} catch (Exception e) {
-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);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empDimissionattend:update')")
+ public void updateEmpDimissionattend(EmpDimissionAttend empDimissionattend) throws FebsException {
+ try {
+ this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
+ } catch (Exception e) {
+ String message = "修改离职当月考勤失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "离职当月考勤信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empDimissionattend:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empDimissionattendService.momentToNormal(ids);
} catch (Exception e) {
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 7a54dc2..f9081ca 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
@@ -24,15 +24,14 @@
import java.util.Map;
/**
-*
-* name:EmpLabortrouble
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工劳资案件控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:36
-* @since JDK1.8
-*/
+ * name:EmpLabortrouble
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工劳资案件控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:36
+ * @since JDK1.8
+ */
@Api(tags = "人员劳资案件信息录入接口")
@Slf4j
@Validated
@@ -41,80 +40,82 @@
@RequiredArgsConstructor
public class EmpLaborTroubleController {
-private final IEmpLaborTroubleService empLabortroubleService;
+ private final IEmpLaborTroubleService empLabortroubleService;
-@GetMapping
-@PreAuthorize("hasAuthority('empLabortrouble:list')")
-public FebsResponse getAllEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
-return new FebsResponse().data(empLabortroubleService.findEmpLabortroubles(empLabortrouble));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empLabortrouble:list')")
+ public FebsResponse getAllEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
+ return new FebsResponse().data(empLabortroubleService.findEmpLabortroubles(empLabortrouble));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empLabortrouble:list')")
-public FebsResponse empLabortroubleList(QueryRequest request, EmpLaborTrouble empLabortrouble) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLabortroubleService.findEmpLabortroubles(request, empLabortrouble));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empLabortrouble:list')")
+ public FebsResponse empLabortroubleList(QueryRequest request, EmpLaborTrouble empLabortrouble) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLabortroubleService.findEmpLabortroubles(request, empLabortrouble));
+ return new FebsResponse().data(dataTable);
+ }
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpLaborTrouble empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empLabortroubleService.count());
List<EmpLaborTrouble> records = this.empLabortroubleService.findEmpLabortroubles(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpLaborTrouble.class, response).downXlsx(records, false);
}
-@PostMapping
-@PreAuthorize("hasAuthority('empLabortrouble:add')")
-public void addEmpLabortrouble(@Valid EmpLaborTrouble empLabortrouble) throws FebsException {
-try {
-this.empLabortroubleService.createEmpLabortrouble(empLabortrouble);
-} catch (Exception e) {
-String message = "新增员工劳资案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-@DeleteMapping
-@PreAuthorize("hasAuthority('empLabortrouble:delete')")
-public void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
-try {
-this.empLabortroubleService.deleteEmpLabortrouble(empLabortrouble);
-} catch (Exception e) {
-String message = "删除员工劳资案件失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empLabortrouble:add')")
+ public void addEmpLabortrouble(@Valid EmpLaborTrouble empLabortrouble) throws FebsException {
+ try {
+ this.empLabortroubleService.createEmpLabortrouble(empLabortrouble);
+ } catch (Exception e) {
+ 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);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empLabortrouble:delete')")
+ public void deleteEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
+ try {
+ this.empLabortroubleService.deleteEmpLabortrouble(empLabortrouble);
+ } catch (Exception e) {
+ String message = "删除员工劳资案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empLabortrouble:update')")
-public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
-try {
-this.empLabortroubleService.updateEmpLabortrouble(empLabortrouble);
-} catch (Exception e) {
-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);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empLabortrouble:update')")
+ public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
+ try {
+ this.empLabortroubleService.updateEmpLabortrouble(empLabortrouble);
+ } catch (Exception e) {
+ String message = "修改员工劳资案件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "劳资案件信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empLabortrouble:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empLabortroubleService.momentToNormal(ids);
} catch (Exception e) {
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 cbfe60f..3c24b72 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
@@ -54,14 +54,16 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empResignService.findEmpResigns(request, empResign));
return new FebsResponse().data(dataTable);
}
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpResign empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empResignService.count());
List<EmpResign> records = this.empResignService.findEmpResigns(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpResign.class, response).downXlsx(records, false);
}
+
@PostMapping
@PreAuthorize("hasAuthority('empResign:add')")
public void addEmpResign(@Valid EmpResign empResign) throws FebsException {
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java
index f656cda..faa7433 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/IRemoteUserService.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.server.hr.feign.fallback.RemoteUserServiceFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
@@ -24,4 +25,7 @@
*/
@GetMapping("user")
FebsResponse userList(@RequestParam("queryRequest") QueryRequest queryRequest, @RequestParam("user") SystemUser user);
+
+ @PostMapping("user/updateStatus")
+ void updateStatus(@RequestParam("certificateNumb")String certificateNumb);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java
index fbadcf2..5595d32 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/feign/fallback/RemoteUserServiceFallback.java
@@ -1,6 +1,9 @@
package cc.mrbird.febs.server.hr.feign.fallback;
import cc.mrbird.febs.common.core.annotation.Fallback;
+import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
@@ -14,9 +17,18 @@
@Override
public IRemoteUserService create(Throwable throwable) {
- return (queryRequest, user) -> {
- log.error("获取用户信息失败", throwable);
- return null;
+ return new IRemoteUserService(){
+
+ @Override
+ public FebsResponse userList(QueryRequest queryRequest, SystemUser user) {
+ log.error("获取用户信息失败", throwable);
+ return null;
+ }
+
+ @Override
+ public void updateStatus(String certificateNumb) {
+ log.error("禁用账户失败", throwable);
+ }
};
}
-}
\ 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 dae1a44..148d2c7 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,14 +41,14 @@
*
* @param empAccidentcases empAccidentcases
*/
- void createEmpAccidentcases(EmpAccidentCases empAccidentcases);
+ void createEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException;
/**
* 修改
*
* @param empAccidentcases empAccidentcases
*/
- void updateEmpAccidentcases(EmpAccidentCases empAccidentcases);
+ void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException;
/**
* 删除
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 5279cee..eeec45b 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,14 +41,14 @@
*
* @param empBadrecord empBadrecord
*/
- void createEmpBadrecord(EmpBadRecord empBadrecord);
+ void createEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException;
/**
* 修改
*
* @param empBadrecord empBadrecord
*/
- void updateEmpBadrecord(EmpBadRecord empBadrecord);
+ void updateEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException;
/**
* 删除
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 6f25cb4..aa91190 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,14 +41,14 @@
*
* @param empLabortrouble empLabortrouble
*/
- void createEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+ void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException;
/**
* 修改
*
* @param empLabortrouble empLabortrouble
*/
- void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble);
+ void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException;
/**
* 删除
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 3f48f5c..418b310 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,14 +41,14 @@
*
* @param empResign empResign
*/
- void createEmpResign(EmpResign empResign);
+ void createEmpResign(EmpResign empResign) throws FebsException;
/**
* 修改
*
* @param empResign empResign
*/
- void updateEmpResign(EmpResign empResign);
+ void updateEmpResign(EmpResign empResign) throws FebsException;
/**
* 删除
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
index c1049e0..df92e31 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpUnemploymentService.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -40,14 +41,14 @@
*
* @param empUnemployment empUnemployment
*/
- void createEmpUnemployment(EmpUnemployment empUnemployment);
+ void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException;
/**
* 修改
*
* @param empUnemployment empUnemployment
*/
- void updateEmpUnemployment(EmpUnemployment empUnemployment);
+ void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException;
/**
* 删除
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 6fc4cb7..814ddaa 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
@@ -7,6 +7,8 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.entity.system.SystemUser;
+import cc.mrbird.febs.common.core.exception.FebsException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -95,7 +97,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) {
+ public void createEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
+ LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
+ lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
+ lambdaQueryWrapper.eq(EmpAccidentCases::getDelFlag,0);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
empAccidentcases.setAccidentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
if (empAccidentcases.getReprotTime() == null) {
empAccidentcases.setReprotTime(empAccidentcases.getInjuredTime());
@@ -113,7 +122,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) {
+ public void updateEmpAccidentcases(EmpAccidentCases empAccidentcases) throws FebsException {
+ LambdaQueryWrapper<EmpAccidentCases> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpAccidentCases::getEmpId, empAccidentcases.getEmpId());
+ lambdaQueryWrapper.eq(EmpAccidentCases::getHrDoDate, empAccidentcases.getHrDoDate());
+ lambdaQueryWrapper.eq(EmpAccidentCases::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpAccidentCases::getAccidentId,empAccidentcases.getAccidentId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
EmpAccidentCases dbData = this.getById(empAccidentcases.getAccidentId());
empAccidentcases.setCreateTime(dbData.getCreateTime());
empAccidentcases.setCreator(dbData.getCreator());
@@ -211,4 +228,4 @@
this.save(empAccidentcases);
}
}
-}
\ 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 9be1689..f532a8e 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,6 +1,8 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.mapper.EmpBadRecordMapper;
@@ -81,7 +83,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpBadrecord(EmpBadRecord empBadrecord) {
+ public void createEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+ LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
+ lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
+ lambdaQueryWrapper.eq(EmpBadRecord::getDelFlag,0);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
empBadrecord.setBadId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empBadrecord.setCreator(operatorId);
empBadrecord.setModifier(operatorId);
@@ -90,7 +99,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpBadrecord(EmpBadRecord empBadrecord) {
+ public void updateEmpBadrecord(EmpBadRecord empBadrecord) throws FebsException {
+ LambdaQueryWrapper<EmpBadRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpBadRecord::getEmpId, empBadrecord.getEmpId());
+ lambdaQueryWrapper.eq(EmpBadRecord::getBadDate, empBadrecord.getBadDate());
+ lambdaQueryWrapper.eq(EmpBadRecord::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpBadRecord::getBadId,empBadrecord.getBadId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
EmpBadRecord dbData = this.getById(empBadrecord.getBadId());
empBadrecord.setCreateTime(dbData.getCreateTime());
empBadrecord.setCreator(dbData.getCreator());
@@ -156,4 +173,4 @@
this.save(empBadrecord);
}
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 3cdd4fc..129754e 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -11,6 +11,7 @@
import cc.mrbird.febs.common.core.utils.MyUtil;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
+import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
import cc.mrbird.febs.server.hr.service.IEmpJobChangeService;
@@ -61,7 +62,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpBaseInfoServiceImpl extends ServiceImpl<EmpBaseInfoMapper, EmpBaseInfo> implements IEmpBaseInfoService {
private final RedisService redisService;
- private final IRemoteDeptService remoteDeptService;
+ private final IRemoteUserService iRemoteUserService;
private final EmpBaseInfoMapper empBaseInfoMapper;
private final IEmpDimissionLogService dimissionLogService;
private final IEmpJobChangeService jobChangeService;
@@ -280,9 +281,11 @@
dimissionLog.setReporter(empDimissionLog.getReporter());
dimissionLog.setCreator(operatorId);
dimissionLog.setModifier(operatorId);
-
dimissionLogService.save(dimissionLog);
}
+ EmpBaseInfo empBaseInfo = this.getById(dimissionLog.getEmpId());
+ //禁用账户
+ iRemoteUserService.updateStatus(empBaseInfo.getCertificateNumb());
return empBaseInfoMapper.closeEmpArchives(list, empDimissionLog.getDimissionType(), empDimissionLog.getDimissionDate(), empDimissionLog.getRemark(), operatorId) > 0;
}
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 566e778..5fabb7e 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
@@ -3,9 +3,8 @@
import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.DicItem;
-import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
-import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
-import cc.mrbird.febs.server.hr.entity.EmpOccupational;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.entity.*;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
import cc.mrbird.febs.server.hr.service.IEmpLaborTroubleService;
@@ -101,7 +100,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
+ public void createEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
+ LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getDelFlag,0);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empLabortrouble.setCreator(operatorId);
empLabortrouble.setModifier(operatorId);
@@ -110,7 +116,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) {
+ public void updateEmpLabortrouble(EmpLaborTrouble empLabortrouble) throws FebsException {
+ LambdaQueryWrapper<EmpLaborTrouble> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getEmpId, empLabortrouble.getEmpId());
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getArbitrationDate, empLabortrouble.getArbitrationDate());
+ lambdaQueryWrapper.eq(EmpLaborTrouble::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpLaborTrouble::getArbitrationId,empLabortrouble.getArbitrationId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
EmpLaborTrouble dbData = this.getById(empLabortrouble.getArbitrationId());
empLabortrouble.setCreateTime(dbData.getCreateTime());
empLabortrouble.setCreator(dbData.getCreator());
@@ -200,4 +214,4 @@
return list;
}
-}
\ 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 687f61e..56d7901 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,8 +1,10 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpResign;
+import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
import cn.hutool.core.date.DateUtil;
@@ -80,7 +82,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpResign(EmpResign empResign) {
+ public void createEmpResign(EmpResign empResign) throws FebsException {
+ LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
+ lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
+ lambdaQueryWrapper.eq(EmpResign::getDelFlag,0);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
empResign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empResign.setCreator(operatorId);
empResign.setModifier(operatorId);
@@ -89,7 +98,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpResign(EmpResign empResign) {
+ public void updateEmpResign(EmpResign empResign) throws FebsException {
+ LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
+ lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
+ lambdaQueryWrapper.eq(EmpResign::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpResign::getApplayDate,empResign.getApplayDate());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
EmpResign dbData = this.getById(empResign.getResignId());
empResign.setCreateTime(dbData.getCreateTime());
empResign.setCreator(dbData.getCreator());
@@ -155,4 +172,4 @@
this.save(resign);
}
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index 1b2cbdf..ad03065 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -6,6 +6,8 @@
import java.util.List;
import java.util.Optional;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -84,7 +86,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createEmpUnemployment(EmpUnemployment empUnemployment) {
+ public void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
+ lambdaQueryWrapper.eq(EmpUnemployment::getDelFlag,0);
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empUnemployment.setCreator(operatorId);
empUnemployment.setModifier(operatorId);
@@ -93,7 +102,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpUnemployment(EmpUnemployment empUnemployment) {
+ public void updateEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
+ LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
+ lambdaQueryWrapper.eq(EmpUnemployment::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("当日记录已存在");
+ }
EmpUnemployment dbData = this.getById(empUnemployment.getUnemploymentId());
empUnemployment.setCreateTime(dbData.getCreateTime());
empUnemployment.setCreator(dbData.getCreator());
@@ -161,4 +178,4 @@
this.save(empUnemployment);
}
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
index 621e447..052ea73 100644
--- a/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
+++ b/febs-server/febs-server-hr/src/main/resources/bootstrap.yml
@@ -6,7 +6,7 @@
config:
server-addr: ${nacos.url}:8848
group: DEFAULT_GROUP
- prefix: febs-server-Hr
+ prefix: febs-server-hr
file-extension: yaml
discovery:
server-addr: ${nacos.url}:8848
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/UserController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/UserController.java
index e309c09..a98eb93 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/UserController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/UserController.java
@@ -90,14 +90,14 @@
@PostMapping
@PreAuthorize("hasAuthority('user:add')")
@ControllerEndpoint(operation = "新增用户", exceptionMessage = "新增用户失败")
- public void addUser(@Valid SystemUser user) {
+ public void addUser(@Valid SystemUser user) throws FebsException {
this.userService.createUser(user);
}
@PutMapping
@PreAuthorize("hasAuthority('user:update')")
@ControllerEndpoint(operation = "修改用户", exceptionMessage = "修改用户失败")
- public void updateUser(@Valid SystemUser user) {
+ public void updateUser(@Valid SystemUser user) throws FebsException {
this.userService.updateUser(user);
}
@@ -156,4 +156,9 @@
List<SystemUser> users = this.userService.findUserDetailList(user, queryRequest).getRecords();
ExcelKit.$Export(SystemUser.class, response).downXlsx(users, false);
}
+
+ @PostMapping("updateStatus")
+ public void updateStatus(@NotBlank(message = "{required}") String certificateNumb) {
+ this.userService.updateUserByCertificateNumb(certificateNumb);
+ }
}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IUserService.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IUserService.java
index be7f0ab..8d84c22 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IUserService.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/IUserService.java
@@ -48,14 +48,14 @@
*
* @param user user
*/
- void createUser(SystemUser user);
+ void createUser(SystemUser user) throws FebsException;
/**
* 修改用户
*
* @param user user
*/
- void updateUser(SystemUser user);
+ void updateUser(SystemUser user) throws FebsException;
/**
* 删除用户
@@ -93,4 +93,15 @@
*/
void resetPassword(String[] usernames);
-}
\ No newline at end of file
+ /**
+ * 冻结账户
+ * @description
+ * @author yz
+ * @date 2021/2/26 10:11 下午
+ * @method updateUserByCertificateNumb
+ * @param certificateNumb 身份证号码
+ * @return void
+ */
+ void updateUserByCertificateNumb(String certificateNumb);
+
+}
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
index f3d9f42..bb93e08 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java
@@ -15,12 +15,14 @@
import cc.mrbird.febs.server.system.service.IUserRoleService;
import cc.mrbird.febs.server.system.service.IUserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.util.LambdaUtil;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -76,7 +78,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createUser(SystemUser user) {
+ public void createUser(SystemUser user) throws FebsException {
+ LambdaQueryWrapper<SystemUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(SystemUser::getCertificateNumb, user.getCertificateNumb());
+ lambdaQueryWrapper.eq(SystemUser::getUsername, user.getUsername());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("此用户已存在");
+ }
// 创建用户
user.setCreateTime(new Date());
user.setAvatar(SystemUser.DEFAULT_AVATAR);
@@ -92,7 +100,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateUser(SystemUser user) {
+ public void updateUser(SystemUser user) throws FebsException {
+ LambdaQueryWrapper<SystemUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(SystemUser::getCertificateNumb, user.getCertificateNumb());
+ lambdaQueryWrapper.eq(SystemUser::getUsername, user.getUsername());
+ lambdaQueryWrapper.ne(SystemUser::getUserId,user.getUserId());
+ if (this.count(lambdaQueryWrapper) > 0) {
+ throw new FebsException("此用户已存在");
+ }
// 更新用户
user.setPassword(null);
user.setUsername(null);
@@ -188,4 +203,15 @@
CurrentUser currentUser = FebsUtil.getCurrentUser();
return currentUser != null && id.equals(currentUser.getUserId());
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateUserByCertificateNumb(String certificateNumb) {
+ LambdaUpdateWrapper<SystemUser> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ lambdaUpdateWrapper.eq(SystemUser::getCertificateNumb,certificateNumb);
+ lambdaUpdateWrapper.set(SystemUser::getStatus,0);
+ lambdaUpdateWrapper.set(SystemUser::getModifyTime,new Date());
+ this.update(lambdaUpdateWrapper);
+ }
+
}
--
Gitblit v1.8.0