Merge branch 'lybfix20210302'

luoyb

2021-03-02 f961867e0e1ca3251928b1134eb66549a6a89ee3

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

@@ -186,6 +186,7 @@
        List<EmpBaseInfo> allRoles = empBaseInfoService.list(wrapper);
        return new FebsResponse().data(allRoles);
    }
    
    @ApiOperation(value = "导出员工")
   @RequestMapping(value = "export",method= RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
@@ -194,6 +195,21 @@
        List<EmpBaseInfo> records = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
        ExcelKit.$Export(EmpBaseInfo.class, response).downXlsx(records, false);
   }
    
    @ApiOperation(value = "导出员工")
   @RequestMapping(value = "exportWithField",method= RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
    public void exportWithField(QueryRequest request, HttpServletResponse response, String exportField,EmpBaseInfo empBaseinfo) throws IOException {
       request.setPageSize(25535);
       request.setPageNum(1);
      List<EmpBaseInfo> exportList = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
      List<Map<String, Object>> listMapDicItem = new ArrayList();
      List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, listMapDicItem);
      String fileName = "在职员工列表";
      Date currentDate = new Date();
      String dateStr = DateUtil.formatDate(currentDate);
      boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
   }

    @ApiOperation(value = "导入员工")
   @PostMapping("importEmp")