合同信息增加到处备注

yijiusmile

2021-05-17 00c11e16ac27b31c8d29b3c64afa88082010c33e

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

@@ -76,7 +76,7 @@
            queryWrapper.like("a.CertificateNumb", empLeaveinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
            queryWrapper.like("a.DeptName", empLeaveinfo.getDeptName());
            queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
@@ -87,7 +87,7 @@
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "beginTime", FebsConstant.ORDER_ASC, true);
        IPage<EmpLeaveInfo> iPage = empLeaveinfoMapper.selectPageVo(page, queryWrapper);
        iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
        return iPage;
@@ -155,15 +155,18 @@

   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList) {
   public void importEmpLeaveInfo(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;
            }
         EmpLeaveInfo leaveInfo = new EmpLeaveInfo();
         leaveInfo.setLeaveId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         leaveInfo.setEmpNumb(list.get(0).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()));
@@ -174,7 +177,7 @@
                returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            leaveInfo.setDelFlag(2);
            leaveInfo.setDelFlag(0);
            leaveInfo.setEmpId(empBaseInfo.getEmpId());
         leaveInfo.setDeptName(list.get(1).toString());
         leaveInfo.setDeptId(dept.getDeptId());
@@ -190,7 +193,12 @@
         if (StringUtils.isNotBlank(list.get(7).toString())) {
            leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
         }
         leaveInfo.setLeaveType(list.get(8).toString().equals("病假")?"1":"2");
            //请假类型
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"leavetype")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                leaveInfo.setLeaveType(dicItem.getDicItemCode());
            }

         if (StringUtils.isNotBlank(list.get(9).toString())) {
            leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
         }