From f22196a273dae1cc4f67bf6e4806e0e33fae7997 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 10 三月 2021 23:49:09 +0800
Subject: [PATCH] fix(bug修复): 部门管理、员工信息查询与显示
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java | 145 +++++++++++++++++++++++++----------------------
1 files changed, 77 insertions(+), 68 deletions(-)
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 ecd4add..7fe2c93 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
@@ -8,6 +9,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,15 +26,14 @@
import java.util.Map;
/**
-*
-* name:EmpInsurance
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工社保申请控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:23
-* @since JDK1.8
-*/
+ * name:EmpInsurance
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工社保申请控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:23
+ * @since JDK1.8
+ */
@Api(tags = "人员社保申请信息录入接口")
@Slf4j
@Validated
@@ -41,80 +42,88 @@
@RequiredArgsConstructor
public class EmpInsuranceController {
-private final IEmpInsuranceService empInsuranceService;
+ private final IEmpInsuranceService empInsuranceService;
-@GetMapping
-@PreAuthorize("hasAuthority('empInsurance:list')")
-public FebsResponse getAllEmpInsurances(EmpInsurance empInsurance) {
-return new FebsResponse().data(empInsuranceService.findEmpInsurances(empInsurance));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empInsurance:list')")
+ public FebsResponse getAllEmpInsurances(EmpInsurance empInsurance) {
+ return new FebsResponse().data(empInsuranceService.findEmpInsurances(empInsurance));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empInsurance:list')")
-public FebsResponse empInsuranceList(QueryRequest request, EmpInsurance empInsurance) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empInsuranceService.findEmpInsurances(request, empInsurance));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empInsurance:list')")
+ public FebsResponse empInsuranceList(QueryRequest request, EmpInsurance empInsurance) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empInsuranceService.findEmpInsurances(request, empInsurance));
+ 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, EmpInsurance empBaseinfo, HttpServletResponse response) {
-
+ request.setPageSize(this.empInsuranceService.count());
List<EmpInsurance> records = this.empInsuranceService.findEmpInsurances(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpInsurance.class, response).downXlsx(records, false);
}
-@PostMapping
-@PreAuthorize("hasAuthority('empInsurance:add')")
-public void addEmpInsurance(@Valid EmpInsurance empInsurance) throws FebsException {
-try {
-this.empInsuranceService.createEmpInsurance(empInsurance);
-} catch (Exception e) {
-String message = "新增员工社保申请失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-@DeleteMapping
-@PreAuthorize("hasAuthority('empInsurance:delete')")
-public void deleteEmpInsurance(EmpInsurance empInsurance) throws FebsException {
-try {
-this.empInsuranceService.deleteEmpInsurance(empInsurance);
-} catch (Exception e) {
-String message = "删除员工社保申请失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empInsurance:add')")
+ public void addEmpInsurance(@Valid EmpInsurance empInsurance) throws FebsException {
+ try {
+ this.empInsuranceService.createEmpInsurance(empInsurance);
+ } catch (Exception e) {
+ String message = "新增员工社保申请失败";
+ if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+ message = e.getMessage();
+ }
+ 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);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empInsurance:delete')")
+ public void deleteEmpInsurance(EmpInsurance empInsurance) throws FebsException {
+ try {
+ this.empInsuranceService.deleteEmpInsurance(empInsurance);
+ } catch (Exception e) {
+ String message = "删除员工社保申请失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empInsurance:update')")
-public void updateEmpInsurance(EmpInsurance empInsurance) throws FebsException {
-try {
-this.empInsuranceService.updateEmpInsurance(empInsurance);
-} catch (Exception e) {
-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);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empInsurance:update')")
+ public void updateEmpInsurance(EmpInsurance empInsurance) throws FebsException {
+ try {
+ this.empInsuranceService.updateEmpInsurance(empInsurance);
+ } catch (Exception e) {
+ String message = "修改员工社保申请失败";
+ if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+ message = e.getMessage();
+ }
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "社保申请信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empInsurance:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empInsuranceService.momentToNormal(ids);
} catch (Exception e) {
--
Gitblit v1.8.0