febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java
@@ -47,4 +47,14 @@ * 合同状态 */ public final static String CONTRACTSTATUS = "CONTRACTSTATUS"; /** * 员工类型 */ public final static String EMPTYPE = "EMPTYPE"; /** * 保险类型 */ public final static String INSURANCETYPE = "INSURANCETYPE"; } febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -338,6 +338,9 @@ @TableField("remark") private String remark = ""; @TableField("imagePath") private String imagePath; @TableField(exist = false) private String ageStr = ""; @@ -390,6 +393,8 @@ @DateTimeFormat(pattern = "yyyy-MM-dd") private Date applayDate; @TableField(exist = false) private String reason; @TableField(exist = false) febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -217,9 +217,19 @@ List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class); list.forEach(p -> { p.setSexName("1".equals(p.getSex()) ? "男" : "女"); p.setEmpTypeName("1".equals(p.getEmpType()) ? "正式工" : "临时工"); p.setInsuranceTypeName("1".equals(p.getInsuranceType()) ? "（深户）五险一档" : "（非深户）五险一档"); p.setArchivesStatusName("0".equals(p.getArchivesStatus()) ? "未移交" : "已移交"); //保险类型 p.setInsuranceTypeName(dicItems.stream() .filter(k -> DicCode.INSURANCETYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getInsuranceType())) .findFirst() .map(DicItem::getDicItemName) .orElse("汉族")); //员工类别 p.setEmpTypeName(dicItems.stream() .filter(k -> DicCode.EMPTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getEmpType())) .findFirst() .map(DicItem::getDicItemName) .orElse("汉族")); // 设置民族 p.setNationName(dicItems.stream() .filter(k -> DicCode.NATION.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getNation())) 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
