备注导出日期修改为没有时分秒格式，员工信息增加入离职类型的导出

yijiusmile

2021-03-17 2467978ddf7cbd4624e5d2515ffe3c089dbfd310

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java

@@ -1,6 +1,8 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
@@ -78,11 +80,10 @@
      }
        if (StringUtils.isNotBlank(empRemarkinfo.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empRemarkinfo.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
    }

@@ -150,7 +151,7 @@
   @Transactional(rollbackFor = Exception.class)
    public void importEmpRemarkInfo(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
          EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();