Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-01 1c7cb9c300fda246db57ef5c43d118c7eaef22d6

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpContractInfoController.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.EmpAccidentCases;
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 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:42
* @date 2021-01-31 11:28:23
* @since JDK1.8
*/
@Api(tags = "人员合同信息录入接口")
@Slf4j
@Validated
@RestController
@RequestMapping("empContractinfo")
@RequestMapping("empContractInfo")
@RequiredArgsConstructor
public class EmpContractInfoController {

@@ -46,14 +55,21 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empContractinfoService.findEmpContractinfos(request, empContractinfo));
return new FebsResponse().data(dataTable);
}

    @ApiOperation(value = "导出员工")
    @RequestMapping(value = "export",method= RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
    public void export(QueryRequest request, EmpContractInfo empBaseinfo, HttpServletResponse response) {
        request.setPageSize(this.empContractinfoService.count());
        List<EmpContractInfo> records = this.empContractinfoService.findEmpContractinfos(request, empBaseinfo).getRecords();
        ExcelKit.$Export(EmpContractInfo.class, response).downXlsx(records, false);
    }
@PostMapping
@PreAuthorize("hasAuthority('empContractinfo:add')")
public void addEmpContractinfo(@Valid EmpContractInfo empContractinfo) throws FebsException {
try {
this.empContractinfoService.createEmpContractinfo(empContractinfo);
} catch (Exception e) {
String message = "新增EmpContractinfo失败";
String message = "新增员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +81,19 @@
try {
this.empContractinfoService.deleteEmpContractinfo(empContractinfo);
} catch (Exception e) {
String message = "删除EmpContractinfo失败";
String message = "删除员工合同信息失败";
log.error(message, e);
throw new FebsException(message);
}
}

@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);
}
@@ -77,9 +105,22 @@
try {
this.empContractinfoService.updateEmpContractinfo(empContractinfo);
} catch (Exception e) {
String message = "修改EmpContractinfo失败";
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);
        }
    }
}