Merge remote-tracking branch 'origin/master'

luoyb

2021-05-31 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78

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

@@ -53,7 +53,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpUnemploymentServiceImpl extends ServiceImpl<EmpUnemploymentMapper, EmpUnemployment> implements IEmpUnemploymentService {

   private final RedisService redisService;
    private final RedisService redisService;
    private final EmpUnemploymentMapper empUnemploymentMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
@@ -63,7 +63,7 @@

    @Override
    public IPage<EmpUnemployment> findEmpUnemployments(QueryRequest request, EmpUnemployment empUnemployment) {
       QueryWrapper<EmpUnemployment> queryWrapper = new QueryWrapper<>();
        QueryWrapper<EmpUnemployment> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empUnemployment.getDelFlag());
        if (StringUtils.isNotBlank(empUnemployment.getEmpNumb())) {
            queryWrapper.like("a.EmpNumb", empUnemployment.getEmpNumb());
@@ -75,10 +75,10 @@
            queryWrapper.like("a.CertificateNumb", empUnemployment.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empUnemployment.getDeptName())) {
            queryWrapper.like("a.DeptName", empUnemployment.getDeptName());
            queryWrapper.like("b.allDeptName", empUnemployment.getDeptName());
        }
        if (StringUtils.isNotBlank(empUnemployment.getApplayDateStr())) {
           queryWrapper.between("a.ApplayDate", empUnemployment.getApplayDateStr().split(",")[0],  empUnemployment.getApplayDateStr().split(",")[1]);
            queryWrapper.between("a.ApplayDate", empUnemployment.getApplayDateStr().split(",")[0], empUnemployment.getApplayDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empUnemployment.getApplayReason())) {
            queryWrapper.like("a.ApplayReason", empUnemployment.getApplayReason());
@@ -88,7 +88,7 @@
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpUnemployment> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
        return empUnemploymentMapper.selectPageVo(page, queryWrapper);
    }

@@ -104,8 +104,8 @@
    public void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
        LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate() );
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag, 1);
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
@@ -121,8 +121,8 @@
        LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
        lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
        lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId,empUnemployment.getUnemploymentId());
        lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag, 1);
        lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId, empUnemployment.getUnemploymentId());
        if (this.count(lambdaQueryWrapper) > 0) {
            throw new FebsException(MyConstant.MESSAGE);
        }
@@ -164,49 +164,55 @@
    public boolean momentToNormal(String ids) {
        String[] str = ids.split(",");
        List<String> list = new ArrayList<>(Arrays.asList(str));
        return empUnemploymentMapper.momentToNormal(list, operatorId)>0;
        return empUnemploymentMapper.momentToNormal(list, operatorId) > 0;
    }


    @Override
   @Transactional(rollbackFor = Exception.class)
    public void importEmpUnemployment(List<List<Object>> listObject,List<String>  returnList) {
       for (List<Object> list : listObject) {
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
    @Transactional(rollbackFor = Exception.class)
    public void importEmpUnemployment(List<List<Object>> listObject, List<String> returnList) {
        for (List<Object> list : listObject) {
            if (list.size() == 0 || StrUtil.isBlank(list.get(0).toString())) {
                continue;
            }
          EmpUnemployment empUnemployment=new EmpUnemployment();
          empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
          empUnemployment.setEmpNumb(list.get(0).toString());
         List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            if(null == depts){
                depts =remoteDeptService.setDeptRedis();
            EmpUnemployment empUnemployment = new EmpUnemployment();
            empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
            empUnemployment.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()));
                returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}部门不存在", listObject.indexOf(list) + 1, list.get(1).toString()));
                continue;
            }
            Long empId = empBaseInfoService.getEmpIdByEmpNumb(list.get(0).toString());
            if (null == empId){
                returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
            if (null == empId) {
                returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}员工编号不存在", listObject.indexOf(list) + 1, list.get(0).toString()));
                continue;
            }
            empUnemployment.setDelFlag(2);
            empUnemployment.setDelFlag(0);
            empUnemployment.setEmpId(empId);
         empUnemployment.setDeptName(list.get(1).toString());
         empUnemployment.setDeptId(dept.getDeptId());
         empUnemployment.setJobName(list.get(2).toString());
         empUnemployment.setEmpName(list.get(3).toString());
         empUnemployment.setCertificateNumb(list.get(4).toString());
         if (StringUtils.isNotBlank(list.get(5).toString())) {
            empUnemployment.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
         }
         empUnemployment.setApplayReason(list.get(6).toString());
         empUnemployment.setReporter(list.get(7).toString());
         empUnemployment.setAuditor(list.get(8).toString());
         empUnemployment.setRemark(list.get(9).toString());
         this.save(empUnemployment);
       }
   }
            empUnemployment.setDeptName(list.get(1).toString());
            empUnemployment.setDeptId(dept.getDeptId());
            empUnemployment.setJobName(list.get(2).toString());
            empUnemployment.setEmpName(list.get(3).toString());
            empUnemployment.setCertificateNumb(list.get(4).toString());
            try {
                if (StringUtils.isNotBlank(list.get(5).toString())) {
                    empUnemployment.setApplayDate(DateUtil.parse(list.get(5).toString()));
                }
            } catch (Exception e) {
                returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}时间格式错误", listObject.indexOf(list) + 1, list.get(0).toString()));
                continue;
            }

            empUnemployment.setApplayReason(list.get(6).toString());
            empUnemployment.setReporter(list.get(7).toString());
            empUnemployment.setAuditor(list.get(8).toString());
            empUnemployment.setRemark(list.get(9).toString());
            this.save(empUnemployment);
        }
    }
}