luoyb
2021-03-25 179ace046094b9d84a8596ea78c9702390d5a56b
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -97,7 +97,7 @@
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "physicalExamDate", FebsConstant.ORDER_ASC, true);
        IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);
        List<EmpPhysicalExam> list = iPage.getRecords();
@@ -192,6 +192,9 @@
         physicalExam.setEmpNumb(list.get(0).toString());
         physicalExam.setDeptName(list.get(1).toString());
         List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            if(null == depts){
                depts =remoteDeptService.setDeptRedis();
            }
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工体检信息异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
@@ -209,7 +212,7 @@
         physicalExam.setJobName(list.get(2).toString());
         physicalExam.setEmpName(list.get(3).toString());
         physicalExam.setCertificateNumb(list.get(4).toString());
         physicalExam.setSex("男".equals(list.get(5).toString()) ? "1" : "2");
         physicalExam.setSex(list.get(5).toString());
         physicalExam.setHospital(list.get(6).toString());
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            physicalExam.setPhysicalExamDate(DateUtil.parseDate(list.get(7).toString()));