fix(bug修复): 增加了请假类型查询项

luoyb

2021-06-02 69e6ce2211b96da8466912a57178f6324cb197ef

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

@@ -3,11 +3,14 @@
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionAttend;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;
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 cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +24,7 @@
import javax.validation.Valid;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * name:EmpDimissionlog
@@ -51,18 +55,24 @@
    @ApiOperation(value = "员工离职记录翻页列表")
    @GetMapping("list")
    public FebsResponse empDimissionlogList(QueryRequest request, EmpDimissionLog empDimissionlog) {
        Map
                <String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionlogService.findEmpDimissionLogs(request, empDimissionlog));
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empDimissionlogService.findEmpDimissionLogs(request, empDimissionlog));
        return new FebsResponse().data(dataTable);
    }

    @ApiOperation(value = "导出员工")
    @RequestMapping(value = "export",method= RequestMethod.POST)
    @RequestMapping(value = "export", method = RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
    public void export(QueryRequest request, EmpDimissionLog empBaseinfo, HttpServletResponse response) {
        request.setPageSize(this.empDimissionlogService.count());
        List<EmpDimissionLog> records = this.empDimissionlogService.findEmpDimissionLogs(request, empBaseinfo).getRecords();
        ExcelKit.$Export(EmpDimissionLog.class, response).downXlsx(records, false);
        List<Map<String,Object>> records = this.empDimissionlogService.findEmpDimissionLogs(request, empBaseinfo).getRecords();
        List<EmpDimissionLog> list = records.parallelStream().map(i->{
            i.put("entryDate", DateUtil.parse(i.get("entryDate").toString()));
            i.put("dimissionDate", DateUtil.parse(i.get("dimissionDate").toString()));
            return BeanUtil.toBean(i,EmpDimissionLog.class);
        }).collect(Collectors.toList());
        ExcelKit.$Export(EmpDimissionLog.class, response).downXlsx(list, false);
    }

    @ApiOperation(value = "员工离职记录增加")
    @PostMapping
    @PreAuthorize("hasAuthority('empDimissionlog:add')")
@@ -91,7 +101,6 @@

    @ApiOperation(value = "员工离职记录逻辑删除")
    @DeleteMapping("{ids}")
    @PreAuthorize("hasAuthority('empDimissionlog:delete')")
    public void logicDeleteEmpDimissionlog(@PathVariable("ids") String ids) throws FebsException {
        try {
            this.empDimissionlogService.logicDelEmpDimissionLog(ids);