luoyb
2021-04-24 0ad6eb5da00eb35a68ec892db9b75bf4c7b79afc
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -93,7 +93,7 @@
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "beginDate", FebsConstant.ORDER_ASC, true);
        IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);
        List<EmpContractInfo> list = iPage.getRecords();
        //设置字典数据
@@ -199,7 +199,7 @@
                returnList.add(StrUtil.format("导入员工合同信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            contractInfo.setDelFlag(2);
            contractInfo.setDelFlag(0);
            contractInfo.setEmpId(empId);
         contractInfo.setDeptName(list.get(1).toString());
         contractInfo.setDeptId(dept.getDeptId());
@@ -217,7 +217,7 @@
            contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
         }
         if (StringUtils.isNotBlank(list.get(8).toString())) {
            contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
            contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
         }
            //合同
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);