From d90db860b7ea15a6d6c58a3e77b649966f3ab6bf Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 08 四月 2026 21:05:26 +0800
Subject: [PATCH] fix(hr): 修正合同信息查询条件中的员工状态过滤
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java | 143 ++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 70 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java
index 9e7e8a5..6e130be 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/SysConfigController.java
@@ -1,16 +1,15 @@
package cc.mrbird.febs.server.system.controller;
-import cc.mrbird.febs.common.core.entity.system.SysConfig;
-import cc.mrbird.febs.server.system.service.ISysConfigService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.SysConfig;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.server.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -18,15 +17,14 @@
import java.util.Map;
/**
-*
-* name:SysConfig
-* package:cc.mrbird.febs.server.system.controller
-* description:参数配置表控制器
-*
-* @author Alan
-* @date 2021-02-20 09:40:38
-* @since JDK1.8
-*/
+ * name:SysConfig
+ * package:cc.mrbird.febs.server.system.controller
+ * description:参数配置表控制器
+ *
+ * @author Alan
+ * @date 2021-02-20 09:40:38
+ * @since JDK1.8
+ */
@Api(tags = "参数配置表管理接口")
@Slf4j
@Validated
@@ -35,67 +33,72 @@
@RequiredArgsConstructor
public class SysConfigController {
-private final ISysConfigService sysConfigService;
+ private final ISysConfigService sysConfigService;
-@ApiOperation(value = "参数配置表无翻页列表")
-@GetMapping
-public FebsResponse getAllSysConfigs(SysConfig sysConfig) {
-return new FebsResponse().data(sysConfigService.findSysConfigs(sysConfig));
-}
+ @ApiOperation(value = "参数配置表无翻页列表")
+ @GetMapping
+ public FebsResponse getAllSysConfigs(SysConfig sysConfig) {
+ return new FebsResponse().data(sysConfigService.findSysConfigs(sysConfig));
+ }
-@ApiOperation(value = "参数配置表翻页列表")
-@GetMapping("list")
-public FebsResponse sysConfigList(QueryRequest request, SysConfig sysConfig) {
-Map
-<String, Object> dataTable = FebsUtil.getDataTable(this.sysConfigService.findSysConfigs(request, sysConfig));
-return new FebsResponse().data(dataTable);
-}
+ @ApiOperation(value = "参数配置表翻页列表")
+ @GetMapping("list")
+ public FebsResponse sysConfigList(QueryRequest request, SysConfig sysConfig) {
+ Map
+ <String, Object> dataTable = FebsUtil.getDataTable(this.sysConfigService.findSysConfigs(request, sysConfig));
+ return new FebsResponse().data(dataTable);
+ }
-@ApiOperation(value = "参数配置表增加")
-@PostMapping
-public void addSysConfig(@Valid SysConfig sysConfig) throws FebsException {
-try {
-this.sysConfigService.createSysConfig(sysConfig);
-} catch (Exception e) {
-String message = "新增参数配置表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "参数配置表增加")
+ @PostMapping
+ public void addSysConfig(@Valid SysConfig sysConfig) throws FebsException {
+ try {
+ this.sysConfigService.createSysConfig(sysConfig);
+ } catch (Exception e) {
+ String message = "新增参数配置表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "参数配置表物理删除")
-@DeleteMapping
-public void deleteSysConfig(SysConfig sysConfig) throws FebsException {
-try {
-this.sysConfigService.deleteSysConfig(sysConfig);
-} catch (Exception e) {
-String message = "删除参数配置表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "参数配置表物理删除")
+ @DeleteMapping
+ public void deleteSysConfig(SysConfig sysConfig) throws FebsException {
+ try {
+ this.sysConfigService.deleteSysConfig(sysConfig);
+ } catch (Exception e) {
+ String message = "删除参数配置表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "参数配置表逻辑删除")
-@DeleteMapping("{ids}")
-public void logicDeleteSysConfig(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.sysConfigService.logicDelSysConfig(ids);
-} catch (Exception e) {
-String message = "逻辑删除参数配置表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "参数配置表逻辑删除")
+ @DeleteMapping("{ids}")
+ public void logicDeleteSysConfig(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.sysConfigService.logicDelSysConfig(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除参数配置表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@ApiOperation(value = "参数配置表修改")
-@PutMapping
-public void updateSysConfig(SysConfig sysConfig) throws FebsException {
-try {
-this.sysConfigService.updateSysConfig(sysConfig);
-} catch (Exception e) {
-String message = "修改参数配置表失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @ApiOperation(value = "参数配置表修改")
+ @PutMapping
+ public void updateSysConfig(SysConfig sysConfig) throws FebsException {
+ try {
+ this.sysConfigService.updateSysConfig(sysConfig);
+ } catch (Exception e) {
+ String message = "修改参数配置表失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @RequestMapping(value = "set/contract/remind",method = RequestMethod.POST)
+ public void setContractRemindToRedis() throws FebsException{
+ sysConfigService.setContractRemindToRedis();
+ }
}
--
Gitblit v1.8.0