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

luoyb

2021-02-26 cad1de1d4ff43f3d1cadb10195b40517c0ba28cd

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

基本信息录入bug修改；增加了请假类型字典项

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

@@ -57,4 +57,9 @@
     * 保险类型
     */
    public final static String INSURANCETYPE = "INSURANCETYPE";

    /**
     * 请假类型
     */
    public final static String LEAVETYPE = "LEAVETYPE";
}

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

@@ -110,6 +110,11 @@
    @ExcelField(value = "请假类型", writeConverterExp = "1=事假,2=病假")
    private String leaveType = "";

    @FieldInfo(name = "leaveTypeName", type = "varchar", explain = "请假类型")
    @TableField(exist = false)
    private String leaveTypeName = "";


    @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
    @TableField("leaveDay")
    @ExcelField(value = "请假天数")

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

@@ -7,6 +7,9 @@
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.server.hr.entity.EmpBaseInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -30,6 +33,7 @@
import cc.mrbird.febs.server.hr.service.IEmpLeaveInfoService;
import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
import sun.plugin2.ipc.IPCFactory;

/**
 * name:EmpLeaveinfo
@@ -75,7 +79,9 @@
            queryWrapper.le(EmpLeaveInfo::getEndTime, empLeaveinfo.getLeaveDateStr().split(",")[1]);
        }
        Page<EmpLeaveInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        IPage<EmpLeaveInfo> iPage = this.page(page, queryWrapper);
        iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
        return iPage;
    }

    @Override
@@ -171,4 +177,27 @@
            this.save(leaveInfo);
        }
    }

    /**
     *
     * 将列表中的字典项转换成字典名称
     *
     * date 2021-02-26 19:37
     * @author: luoyibo
     * @param list 1
     * @return java.util.List<cc.mrbird.febs.server.hr.entity.EmpLeaveInfo>
     */
    private List<EmpLeaveInfo> convertDicItemName(List<EmpLeaveInfo> list){
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p -> {
            //请假类型
            p.setLeaveTypeName(dicItems.stream()
                    .filter(k -> DicCode.LEAVETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getLeaveType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("事假"));
        });

        return  list;
    }
}

 febs-server/febs-server-hr/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@
      config:
        server-addr: ${nacos.url}:8848
        group: DEFAULT_GROUP
        prefix: febs-server-hr
        prefix: febs-server-Hr
        file-extension: yaml
      discovery:
        server-addr: ${nacos.url}:8848