年龄查询改成或的关系

yijiusmile

2021-02-26 906f38b1427bd6ee6506723e5d2ae09137dbbe5b

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLeaveInfoController.java

@@ -1,18 +1,26 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
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 com.wuwenze.poi.ExcelKit;
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 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.util.List;
import java.util.Map;

/**
@@ -22,13 +30,14 @@
* description:员工请假记录控制器
*
* @author luoyibo
* @date 2021-01-24 20:35:29
* @date 2021-01-31 11:26:13
* @since JDK1.8
*/
@Api(tags = "人员请假信息录入接口")
@Slf4j
@Validated
@RestController
@RequestMapping("empLeaveinfo")
@RequestMapping("empLeaveInfo")
@RequiredArgsConstructor
public class EmpLeaveInfoController {

@@ -37,23 +46,30 @@
@GetMapping
@PreAuthorize("hasAuthority('empLeaveinfo:list')")
public FebsResponse getAllEmpLeaveinfos(EmpLeaveInfo empLeaveinfo) {
return new FebsResponse().data(empLeaveinfoService.findEmpLeaveinfos(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));
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLeaveinfoService.findEmpLeaveInfos(request, empLeaveinfo));
return new FebsResponse().data(dataTable);
}

    @ApiOperation(value = "导出员工")
    @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 = "新增EmpLeaveinfo失败";
String message = "新增员工请假记录失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +81,19 @@
try {
this.empLeaveinfoService.deleteEmpLeaveinfo(empLeaveinfo);
} catch (Exception e) {
String message = "删除EmpLeaveinfo失败";
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);
}
@@ -77,9 +105,22 @@
try {
this.empLeaveinfoService.updateEmpLeaveinfo(empLeaveinfo);
} catch (Exception e) {
String message = "修改EmpLeaveinfo失败";
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 {
        try {
            this.empLeaveinfoService.momentToNormal(ids);
        } catch (Exception e) {
            String message = "请假申请信息提交失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
}