Merge remote-tracking branch 'origin/master'

yz_08

2021-02-24 a15a0fdd42700377dfa4e2198c112210877b74c7

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpDimissionAttendController.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.EmpContractInfo;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.service.IEmpDimissionAttendService;
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:38
* @date 2021-01-31 11:26:04
* @since JDK1.8
*/
@Api(tags = "人员离职当月考勤信息录入接口")
@Slf4j
@Validated
@RestController
@RequestMapping("empDimissionattend")
@RequestMapping("empDimissionAttend")
@RequiredArgsConstructor
public class EmpDimissionAttendController {

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

    @ApiOperation(value = "导出员工")
    @RequestMapping(value = "export",method= RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
    public void export(QueryRequest request, EmpDimissionAttend empBaseinfo, HttpServletResponse response) {
        request.setPageSize(this.empDimissionattendService.count());
        List<EmpDimissionAttend> records = this.empDimissionattendService.findEmpDimissionattends(request, empBaseinfo).getRecords();
        ExcelKit.$Export(EmpDimissionAttend.class, response).downXlsx(records, false);
    }
@PostMapping
@PreAuthorize("hasAuthority('empDimissionattend:add')")
public void addEmpDimissionattend(@Valid EmpDimissionAttend empDimissionattend) throws FebsException {
try {
this.empDimissionattendService.createEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
String message = "新增EmpDimissionattend失败";
String message = "新增离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -65,7 +81,19 @@
try {
this.empDimissionattendService.deleteEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
String message = "删除EmpDimissionattend失败";
String message = "删除离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
}

@DeleteMapping("{ids}")
@PreAuthorize("hasAuthority('empDimissionattend:delete')")
public void logicDeleteEmpDimissionattend(@PathVariable("ids") String ids) throws FebsException {
try {
this.empDimissionattendService.logicDelEmpDimissionattend(ids);
} catch (Exception e) {
String message = "逻辑删除离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
@@ -77,9 +105,22 @@
try {
this.empDimissionattendService.updateEmpDimissionattend(empDimissionattend);
} catch (Exception e) {
String message = "修改EmpDimissionattend失败";
String message = "修改离职当月考勤失败";
log.error(message, e);
throw new FebsException(message);
}
}

    @ApiOperation(value = "离职当月考勤信息提交")
    @DeleteMapping("toNormal/{ids}")
    @PreAuthorize("hasAuthority('empDimissionattend:delete')")
    public void momentToNormal(@NotBlank(message = "{required}")  @PathVariable("ids") String ids) throws FebsException {
        try {
            this.empDimissionattendService.momentToNormal(ids);
        } catch (Exception e) {
            String message = "离职当月考勤信息提交失败";
            log.error(message, e);
            throw new FebsException(message);
        }
    }
}