fix(bug修复): 基本信息录入

luoyb

2021-03-06 8a5d28595e792bf2d103549752b0c80a10f49a38

fix(bug修复): 基本信息录入

基本信息录入bug修改，结案状态字典转换

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java

@@ -61,10 +61,15 @@
    /**
     * 请假类型
     */
    public final static String LEAVETYPE = "LEAVETYPE";
    public final static String LEAVE_TYPE = "LEAVETYPE";

    /**
     * 仲裁类型
     */
    public final static String ARBITRATIONTYPE = "ARBITRATIONTYPE";

    /**
     * 结案状态
     */
    public final static String  SETTLE_STATUS = "settleStatus";
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java

@@ -290,4 +290,7 @@
    @TableField(exist = false)
    private String injuredTimeStr= "";

    @FieldInfo(name = "settleStatusName", type = "bit", explain = "结案状态 0-未结案 1-已结案")
    @TableField(exist = false)
    private String settleStatusName = "";
}

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

@@ -212,7 +212,7 @@
        list.forEach(p -> {
            //请假类型
            p.setLeaveTypeName(dicItems.stream()
                    .filter(k -> DicCode.LEAVETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
                    .filter(k -> DicCode.LEAVE_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("事假"));

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

@@ -7,6 +7,8 @@
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpAccidentCases;
@@ -96,14 +98,19 @@
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpOccupational> page = new Page<>(request.getPageNum(), request.getPageSize());
        return empOccupationalMapper.selectPageVo(page, queryWrapper);
        IPage<EmpOccupational> pageList = empOccupationalMapper.selectPageVo(page, queryWrapper);
        List<EmpOccupational> list = pageList.getRecords();
        //处理数据字典
        pageList.setRecords(covertDicItemName(list));
        return pageList;
    }

    @Override
    public List<EmpOccupational> findEmpOccupationals(EmpOccupational empOccupational) {
        LambdaQueryWrapper<EmpOccupational> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpOccupational::getDelFlag, empOccupational.getDelFlag());
        return this.baseMapper.selectList(queryWrapper);
        List<EmpOccupational> list = this.baseMapper.selectList(queryWrapper);
        return covertDicItemName(list);
    }

    @Override
@@ -246,4 +253,18 @@
            this.save(empOccupational);
        }
    }

    private List<EmpOccupational> covertDicItemName(List<EmpOccupational> list){
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.parallelStream().forEachOrdered(p -> {
            // 设置结案状态
            p.setSettleStatusName(dicItems.stream()
                    .filter(k -> DicCode.SETTLE_STATUS.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getSettleStatus().toString()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse(""));
        });

        return list;
    }
}