Merge branch 'lybfixbug'

luoyb

2021-02-26 a72d1a009bc4068e1ba2890a9730223b9528c2f2

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

@@ -1,7 +1,10 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.mapper.EmpLaborTroubleMapper;
@@ -84,14 +87,16 @@
         queryWrapper.like(EmpLaborTrouble::getArbitrationReason, empLabortrouble.getArbitrationReason());
      }
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        IPage<EmpLaborTrouble> iPage = this.page(page, queryWrapper);
        iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
        return iPage;
    }

    @Override
    public List<EmpLaborTrouble> findEmpLabortroubles(EmpLaborTrouble empLabortrouble) {
        LambdaQueryWrapper<EmpLaborTrouble> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpLaborTrouble::getDelFlag, empLabortrouble.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
        return this.convertDicItemName(this.baseMapper.selectList(queryWrapper));
    }

    @Override
@@ -181,4 +186,18 @@
         this.save(empLabortrouble);
      }
   }

    private List<EmpLaborTrouble> convertDicItemName(List<EmpLaborTrouble> list){
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p -> {
            //仲裁类型
            p.setArbitrationTypeName(dicItems.stream()
                    .filter(k -> DicCode.ARBITRATIONTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getArbitrationType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("劳资纠纷"));
        });

        return  list;
    }
}