luoyb
2021-03-18 567a11a82c7168473b75c0d9b82cc56622a61ab6
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java
@@ -94,10 +94,12 @@
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);
        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        IPage<EmpPhysicalExam> iPage = empPhysicalexamMapper.selectPageVo(page, queryWrapper);
        List<EmpPhysicalExam> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
@@ -182,7 +184,7 @@
    @Transactional(rollbackFor = Exception.class)
   public void importEmpPhysicalExam(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
         EmpPhysicalExam physicalExam = new EmpPhysicalExam();
@@ -190,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()));