From c5cf095903c50112f71612272911d53e9c86b7e0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 12 三月 2021 09:10:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java | 135 ++++++++++++++++++++++----------------------
1 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
index c3da008..114d606 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java
@@ -24,15 +24,14 @@
import java.util.Map;
/**
-*
-* name:EmpLeaveinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工请假记录控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:26:13
-* @since JDK1.8
-*/
+ * name:EmpLeaveinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工请假记录控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:13
+ * @since JDK1.8
+ */
@Api(tags = "人员请假信息录入接口")
@Slf4j
@Validated
@@ -41,80 +40,82 @@
@RequiredArgsConstructor
public class EmpLeaveInfoController {
-private final IEmpLeaveInfoService empLeaveinfoService;
+ private final IEmpLeaveInfoService empLeaveinfoService;
-@GetMapping
-@PreAuthorize("hasAuthority('empLeaveinfo:list')")
-public FebsResponse getAllEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
-return new FebsResponse().data(empLeaveinfoService.findEmpLeaveInfos(empLeaveinfo));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empLeaveinfo:list')")
+ public FebsResponse getAllEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
+ return new FebsResponse().data(empLeaveinfoService.findEmpLeaveInfos(empLeaveinfo));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empLeaveinfo:list')")
-public FebsResponse empLeaveinfoList(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLeaveinfoService.findEmpLeaveInfos(request, empLeaveinfo));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empLeaveinfo:list')")
+ public FebsResponse empLeaveinfoList(QueryRequest request, EmpLeaveInfo empLeaveinfo) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLeaveinfoService.findEmpLeaveInfos(request, empLeaveinfo));
+ return new FebsResponse().data(dataTable);
+ }
+
@ApiOperation(value = "导出员工")
- @RequestMapping(value = "export",method= RequestMethod.POST)
+ @RequestMapping(value = "export", method = RequestMethod.POST)
@ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
public void export(QueryRequest request, EmpLeaveInfo empBaseinfo, HttpServletResponse response) {
request.setPageSize(this.empLeaveinfoService.count());
List<EmpLeaveInfo> records = this.empLeaveinfoService.findEmpLeaveInfos(request, empBaseinfo).getRecords();
ExcelKit.$Export(EmpLeaveInfo.class, response).downXlsx(records, false);
}
-@PostMapping
-@PreAuthorize("hasAuthority('empLeaveinfo:add')")
-public void addEmpLeaveinfo(@Valid EmpLeaveInfo empLeaveinfo) throws FebsException {
-try {
-this.empLeaveinfoService.createEmpLeaveinfo(empLeaveinfo);
-} catch (Exception e) {
-String message = "新增员工请假记录失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
-@DeleteMapping
-@PreAuthorize("hasAuthority('empLeaveinfo:delete')")
-public void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) throws FebsException {
-try {
-this.empLeaveinfoService.deleteEmpLeaveinfo(empLeaveinfo);
-} catch (Exception e) {
-String message = "删除员工请假记录失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empLeaveinfo:add')")
+ public void addEmpLeaveinfo(@Valid EmpLeaveInfo empLeaveinfo) throws FebsException {
+ try {
+ this.empLeaveinfoService.createEmpLeaveinfo(empLeaveinfo);
+ } catch (Exception e) {
+ String message = "新增员工请假记录失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('empLeaveinfo:delete')")
-public void logicDeleteEmpLeaveinfo(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.empLeaveinfoService.logicDelEmpLeaveinfo(ids);
-} catch (Exception e) {
-String message = "逻辑删除员工请假记录失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empLeaveinfo:delete')")
+ public void deleteEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) throws FebsException {
+ try {
+ this.empLeaveinfoService.deleteEmpLeaveinfo(empLeaveinfo);
+ } catch (Exception e) {
+ String message = "删除员工请假记录失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empLeaveinfo:update')")
-public void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) throws FebsException {
-try {
-this.empLeaveinfoService.updateEmpLeaveinfo(empLeaveinfo);
-} catch (Exception e) {
-String message = "修改员工请假记录失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empLeaveinfo:delete')")
+ public void logicDeleteEmpLeaveinfo(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empLeaveinfoService.logicDelEmpLeaveinfo(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除员工请假记录失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empLeaveinfo:update')")
+ public void updateEmpLeaveinfo(EmpLeaveInfo empLeaveinfo) throws FebsException {
+ try {
+ this.empLeaveinfoService.updateEmpLeaveinfo(empLeaveinfo);
+ } catch (Exception e) {
+ String message = "修改员工请假记录失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
@ApiOperation(value = "请假申请信息提交")
@DeleteMapping("toNormal/{ids}")
@PreAuthorize("hasAuthority('empLeaveinfo:delete')")
- public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empLeaveinfoService.momentToNormal(ids);
} catch (Exception e) {
--
Gitblit v1.8.0