From 09c6b3b6fc4ee6b1bc9fa1a6d3da3044729fc95a Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 31 三月 2026 18:50:18 +0800
Subject: [PATCH] fix(hr): 修正年假计算逻辑及代码格式问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.java | 217 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 149 insertions(+), 68 deletions(-)
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 430c113..2407892 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
@@ -1,30 +1,40 @@
package cc.mrbird.febs.server.hr.controller;
-import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
-import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
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 lombok.extern.slf4j.Slf4j;
+import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.entity.EmpContractInfo;
+import cc.mrbird.febs.server.hr.service.IEmpContractInfoService;
+import cc.mrbird.febs.server.hr.util.PoiExportExcel;
+import cn.hutool.core.date.DateUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
-*
-* name:EmpContractinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工合同信息控制器
-*
-* @author luoyibo
-* @date 2021-01-31 11:28:23
-* @since JDK1.8
-*/
+ * name:EmpContractinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工合同信息控制器
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:28:23
+ * @since JDK1.8
+ */
+@Api(tags = "人员合同信息录入接口")
@Slf4j
@Validated
@RestController
@@ -32,66 +42,137 @@
@RequiredArgsConstructor
public class EmpContractInfoController {
-private final IEmpContractInfoService empContractinfoService;
+ private final IEmpContractInfoService empContractinfoService;
-@GetMapping
-@PreAuthorize("hasAuthority('empContractinfo:list')")
-public FebsResponse getAllEmpContractinfos(EmpContractInfo empContractinfo) {
-return new FebsResponse().data(empContractinfoService.findEmpContractinfos(empContractinfo));
-}
+ @GetMapping
+ @PreAuthorize("hasAuthority('empContractinfo:list')")
+ public FebsResponse getAllEmpContractinfos(EmpContractInfo empContractinfo) {
+ return new FebsResponse().data(empContractinfoService.findEmpContractinfos(empContractinfo));
+ }
-@GetMapping("list")
-@PreAuthorize("hasAuthority('empContractinfo:list')")
-public FebsResponse empContractinfoList(QueryRequest request, EmpContractInfo empContractinfo) {
-Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findEmpContractinfos(request, empContractinfo));
-return new FebsResponse().data(dataTable);
-}
+ @GetMapping("list")
+ @PreAuthorize("hasAuthority('empContractinfo:list')")
+ public FebsResponse getEmpContractList(QueryRequest request, EmpContractInfo empContractinfo) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findEmpContractinfos(request, empContractinfo));
+ return new FebsResponse().data(dataTable);
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('empContractinfo:add')")
-public void addEmpContractinfo(@Valid EmpContractInfo empContractinfo) throws FebsException {
-try {
-this.empContractinfoService.createEmpContractinfo(empContractinfo);
-} catch (Exception e) {
-String message = "新增员工合同信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @RequestMapping(value = "remind/list", method = RequestMethod.GET)
+ @PreAuthorize("hasAuthority('empContractinfo:list')")
+ public FebsResponse empRemindContractList(QueryRequest request, EmpContractInfo empContractinfo) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findRemindContractinfos(request, empContractinfo));
+ return new FebsResponse().data(dataTable);
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('empContractinfo:delete')")
-public void deleteEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
-try {
-this.empContractinfoService.deleteEmpContractinfo(empContractinfo);
-} catch (Exception e) {
-String message = "删除员工合同信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "导出员工")
+ @RequestMapping(value = "export", method = RequestMethod.POST)
+ @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
+ public void export(QueryRequest request, HttpServletResponse response,String exportField, EmpContractInfo empBaseInfo) throws IOException {
+ // request.setPageSize(this.empContractinfoService.count());
+ // List<EmpContractInfo> records = this.empContractinfoService.findEmpContractinfos(request, empBaseinfo).getRecords();
+ // ExcelKit.$Export(EmpContractInfo.class, response).downXlsx(records, false);
+ request.setPageSize(25535);
+ request.setPageNum(1);
+ List<EmpContractInfo> exportList = this.empContractinfoService.findRemindContractinfos(request, empBaseInfo).getRecords();
+ List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, null);
+ String fileName = "合同到期提醒员工列表";
+ Date currentDate = new Date();
+ String dateStr = DateUtil.formatDate(currentDate);
+ boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
+ }
-@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);
-}
-}
+ @PostMapping
+ @PreAuthorize("hasAuthority('empContractinfo:add')")
+ public void addEmpContractinfo(@Valid EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.createEmpContractinfo(empContractinfo);
+ } catch (Exception e) {
+ String message = "新增员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('empContractinfo:update')")
-public void updateEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
-try {
-this.empContractinfoService.updateEmpContractinfo(empContractinfo);
-} catch (Exception e) {
-String message = "修改员工合同信息失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @RequestMapping(value = "remind/not", method = RequestMethod.POST)
+ @PreAuthorize("hasAuthority('empContractinfo:update')")
+ public void updateEmpContractRemind(@Valid EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.updateEmpContractRemind(empContractinfo);
+ } catch (Exception e) {
+ String message = "不续签员工合同操作失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+ @RequestMapping(value = "remind/continue", method = RequestMethod.POST)
+ @PreAuthorize("hasAuthority('empContractinfo:add')")
+ public void continueEmpContract(@Valid EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.continueEmpContract(empContractinfo);
+ } catch (Exception e) {
+ String message = "续签员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @DeleteMapping
+ @PreAuthorize("hasAuthority('empContractinfo:delete')")
+ public void deleteEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.deleteEmpContractinfo(empContractinfo);
+ } catch (Exception e) {
+ String message = "删除员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @DeleteMapping("{ids}")
+ 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);
+ }
+ }
+
+ @PutMapping
+ @PreAuthorize("hasAuthority('empContractinfo:update')")
+ public void updateEmpContractinfo(EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.updateEmpContractinfo(empContractinfo);
+ } catch (Exception e) {
+ String message = "修改员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @ApiOperation(value = "合同信息提交")
+ @DeleteMapping("toNormal/{ids}")
+ @PreAuthorize("hasAuthority('empContractinfo:delete')")
+ public void momentToNormal(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.empContractinfoService.momentToNormal(ids);
+ } catch (Exception e) {
+ String message = "合同信息提交失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+ @RequestMapping(value = "retire/rehire", method = RequestMethod.POST)
+ @PreAuthorize("hasAuthority('empContractinfo:add')")
+ public void retireRehireEmpContract(@Valid EmpContractInfo empContractinfo) throws FebsException {
+ try {
+ this.empContractinfoService.retireRehireEmpContract(empContractinfo);
+ } catch (Exception e) {
+ String message = "续签员工合同信息失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
}
--
Gitblit v1.8.0