合同信息增加到处备注

yijiusmile

2021-05-17 00c11e16ac27b31c8d29b3c64afa88082010c33e

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

@@ -73,7 +73,7 @@
         queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
         queryWrapper.like("a.DeptName", empLabortrouble.getDeptName());
         queryWrapper.like("b.allDeptName", empLabortrouble.getDeptName());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
         queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],
@@ -97,7 +97,7 @@
      }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "arbitrationDate", FebsConstant.ORDER_ASC, true);
        IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(page, queryWrapper);
        iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
        return iPage;
@@ -182,13 +182,16 @@
   @Transactional(rollbackFor = Exception.class)
   public void importEmpLaborTrouble(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;
         }
         EmpLaborTrouble empLabortrouble = new EmpLaborTrouble();
         empLabortrouble.setArbitrationId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         empLabortrouble.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()));
@@ -199,7 +202,7 @@
            returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
            continue;
         }
         empLabortrouble.setDelFlag(2);
         empLabortrouble.setDelFlag(0);
         empLabortrouble.setEmpId(empBaseInfo.getEmpId());
         empLabortrouble.setDeptName(list.get(1).toString());
         empLabortrouble.setDeptId(dept.getDeptId());
@@ -239,10 +242,10 @@
        list.forEach(p -> {
            //仲裁类型
            p.setArbitrationTypeName(dicItems.stream()
                    .filter(k -> DicCode.ARBITRATIONTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
                    .filter(k -> DicCode.ZCTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("劳资纠纷"));
                    .orElse(""));
        });

        return  list;