Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-09 6cda44af74fe63b2e276af3228c7bca00dec7ffa

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

@@ -11,10 +11,12 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cn.hutool.core.annotation.AnnotationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wuwenze.poi.ExcelKit;

@@ -204,13 +206,20 @@
       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 = "在职员工列表";
      List<Map<String, Object>> allList = PoiExportExcel.getDataList(exportField, exportList, null);
      String fileName = "员工列表";
      Date currentDate = new Date();
      String dateStr = DateUtil.formatDate(currentDate);
      boolean result = PoiExportExcel.exportCommonExcel(response, fileName + dateStr, fileName, allList);
   }

    @ApiOperation(value = "导出员工")
    @RequestMapping(value = "exportEmpAll",method= RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
    public void exportEmpAll(HttpServletResponse response,EmpBaseInfo empBaseinfo) throws IOException {
      this.empBaseInfoService.exportEmpAll(response,empBaseinfo);
    }

    @ApiOperation(value = "导入员工")
   @PostMapping("importEmp")
   public FebsResponse importEmp(MultipartFile file) {