Merge remote-tracking branch 'origin/master'

Alan

2021-02-21 67aafeb142cf9af2a5dbcd1d17a450f31e2751b3

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

@@ -1,27 +1,40 @@
package cc.mrbird.febs.server.hr.controller;

import cc.mrbird.febs.common.core.entity.system.Role;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;

import cc.mrbird.febs.common.core.entity.system.SystemUser;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
import com.wuwenze.poi.ExcelKit;

import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.util.PoiExportExcel;
import cc.mrbird.febs.server.hr.util.PoiImportExcel;
import cn.hutool.core.date.DateUtil;
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.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;

/**
 * name:EmpBaseInfo
@@ -57,14 +70,15 @@
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseInfoService.findEmpBaseInfos(request, empBaseinfo));
        return new FebsResponse().data(dataTable);
    }
    @GetMapping("options")
    public FebsResponse roles() {
        QueryWrapper<EmpBaseInfo> queryWrapper=new QueryWrapper();
        queryWrapper.eq("delFlag",0);
        queryWrapper.eq("empStatus",0);
        List<EmpBaseInfo> allRoles = empBaseInfoService.list(queryWrapper);
        return new FebsResponse().data(allRoles);
    
    @ApiOperation(value = "智搜人员基本信息翻页列表")
    @GetMapping("zslist")
    @PreAuthorize("hasAuthority('empBaseinfo:list')")
    public FebsResponse empBaseInfoZsList(QueryRequest request, EmpBaseInfo empBaseinfo) {
        Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo));
        return new FebsResponse().data(dataTable);
    }

    @ApiOperation(value = "人员基本信息增加")
    @PostMapping
    @PreAuthorize("hasAuthority('empBaseinfo:add')")
@@ -135,5 +149,32 @@
            throw new FebsException(message);
        }
    }
    
    @ApiOperation(value = "导出员工")
   @RequestMapping(value = "export",method= RequestMethod.POST)
    @ControllerEndpoint(operation = "导出用户数据", exceptionMessage = "导出Excel失败")
   public void export(QueryRequest request, EmpBaseInfo empBaseinfo, HttpServletResponse response) throws IOException {

        List<EmpBaseInfo> records = this.empBaseInfoService.findZsEmpBaseInfos(request, empBaseinfo).getRecords();
        ExcelKit.$Export(EmpBaseInfo.class, response).downXlsx(records, false);
   }

   @ApiOperation(value = "导入员工")
   @PostMapping("importEmp")
   public void importEmp(MultipartFile file) throws IOException {
      InputStream in = null;
      List<List<Object>> listObject = null;
      try {
         if (!file.isEmpty()) {
            in = file.getInputStream();
            listObject = new PoiImportExcel().getListByExcel(in, file.getOriginalFilename());
            in.close();
            empBaseInfoService.importEmpBaseInfo(listObject);
         }
      } catch (Exception e) {
         log.error("导入员工", e);
      }
		
   }

}