枚举类取值逻辑修改

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -14,9 +14,9 @@ public interface LauncherConstant {
      */
 //	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 	// 生产环境
-//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+    String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 	// 测试环境
-	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
+//	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 
     /**
      * nacos 用户名

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/CultivateStatusEnum.java

@@ -0,0 +1,61 @@
+package org.springblade.desk.jobTransfer.pojo.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringPool;
+
+import java.util.Arrays;
+
+/**
+ * 培训类型枚举
+ *
+ * @author qyl
+ * @date 2026-01-12
+ */
+@Getter
+@AllArgsConstructor
+public enum CultivateStatusEnum {
+    EMPTY(StringPool.EMPTY, -1),
+
+    /**
+     * 状态枚举
+     */
+    PRACTICE("实习", 1),
+    JOB_TRANSFER("转岗", 2),
+    LAYOFF("下岗", 3),
+    ;
+    final String name;
+    final Integer code;
+
+    /**
+     * 匹配枚举值
+     *
+     * @param name 名称
+     * @return
+     */
+    public static CultivateStatusEnum of(String name) {
+        return Arrays.stream(CultivateStatusEnum.values())
+                .filter(enumItem -> enumItem.getName().equalsIgnoreCase(name != null ? name : ""))
+                .findFirst()
+                // 在没有找到匹配项时返回默认值
+                .orElse(CultivateStatusEnum.EMPTY);
+    }
+
+    /**
+     * 根据值获取名称
+     *
+     * @param code
+     * @return
+     */
+    public static String getName(Integer code) {
+        if (code == null) {
+            return StringPool.EMPTY; // 或者返回一个默认值，如 "UNKNOWN"
+        }
+        CultivateStatusEnum item = Arrays.stream(CultivateStatusEnum.values())
+                .filter(enumItem -> enumItem.getCode() == code)
+                .findFirst()
+                .orElse(null);
+        return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName();
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MaintenanceStatusEnum.java

@@ -49,6 +49,9 @@ public enum MaintenanceStatusEnum {
      * @return
      */
     public static String getName(Integer code) {
+        if (code == null) {
+            return StringPool.EMPTY; // 或者返回一个默认值，如 "UNKNOWN"
+        }
         MaintenanceStatusEnum item = Arrays.stream(MaintenanceStatusEnum.values())
                 .filter(enumItem -> enumItem.getCode() == code)
                 .findFirst()

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/PostHandleStatusEnum.java

@@ -52,7 +52,10 @@ public enum PostHandleStatusEnum {
      * @param code
      * @return
      */
-    public static String getName(int code) {
+    public static String getName(Integer code) {
+        if (code == null) {
+            return StringPool.EMPTY; // 或者返回一个默认值，如 "UNKNOWN"
+        }
         PostHandleStatusEnum item = Arrays.stream(PostHandleStatusEnum.values())
                 .filter(enumItem -> enumItem.getCode() == code)
                 .findFirst()

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/SkillEnum.java

@@ -48,7 +48,10 @@ public enum SkillEnum {
      * @param code
      * @return
      */
-    public static String getName(int code) {
+    public static String getName(Integer code) {
+        if (code == null) {
+            return StringPool.EMPTY; // 或者返回一个默认值，如 "UNKNOWN"
+        }
         SkillEnum item = Arrays.stream(SkillEnum.values())
                 .filter(enumItem -> enumItem.getCode() == code)
                 .findFirst()

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/StaffTypeEnum.java

@@ -47,7 +47,10 @@ public enum StaffTypeEnum {
      * @param code
      * @return
      */
-    public static String getName(int code) {
+    public static String getName(Integer code) {
+        if (code == null) {
+            return StringPool.EMPTY; // 或者返回一个默认值，如 "UNKNOWN"
+        }
         StaffTypeEnum item = Arrays.stream(StaffTypeEnum.values())
                 .filter(enumItem -> enumItem.getCode() == code)
                 .findFirst()

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/TrainingStatusEnum.java

@@ -26,7 +26,7 @@ public enum TrainingStatusEnum {
     ISSUED("已下发-培训中", 3),
     EXPIRED("已到期", 4),
     TRAINED("已培训-待确认", 5),
-    OK_TRAINED("已培训", 6),
+    OK_TRAINED("培训完成", 6),
     ;
     final String name;
     final Integer code;
@@ -51,7 +51,10 @@ public enum TrainingStatusEnum {
      * @param code
      * @return
      */
-    public static String getName(int code) {
+    public static String getName(Integer code) {
+        if (code == null) {
+            return StringPool.EMPTY; // 或者返回一个默认值，如 "UNKNOWN"
+        }
         TrainingStatusEnum item = Arrays.stream(TrainingStatusEnum.values())
                 .filter(enumItem -> enumItem.getCode() == code)
                 .findFirst()

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java

@@ -3,6 +3,9 @@ package org.springblade.desk.jobTransfer.pojo.vo;
 import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.desk.jobTransfer.pojo.enums.CultivateStatusEnum;
+import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum;
+import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum;
 
 import java.io.Serial;
 
@@ -24,9 +27,12 @@ public class CultivateDetailVO extends CultivateDetailEntity {
     //用工号
     private String code;
 
-    //用工类型
+    //用工类型名
     private String staffTypeName;
 
+    //用工类型
+    private Short staffType;
+
     //培训类型
     private String typeName;
 
@@ -41,4 +47,16 @@ public class CultivateDetailVO extends CultivateDetailEntity {
 
     //状态
     private String caStatusName;
+
+    public String getCaStatusName() {
+        return TrainingStatusEnum.getName(null != this.getCaStatus() ? this.getCaStatus().intValue() : null);
+    }
+
+    public String getStaffTypeName() {
+        return StaffTypeEnum.getName(null != this.getStaffType() ? this.getStaffType().intValue() : null);
+    }
+
+    public String getTypeName() {
+        return CultivateStatusEnum.getName(null != this.getType() ? this.getType().intValue() : null);
+    }
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java

@@ -1,8 +1,13 @@
 package org.springblade.desk.jobTransfer.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum;
+import org.springblade.desk.jobTransfer.pojo.enums.SkillEnum;
+import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum;
+import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum;
 
 import java.io.Serial;
 
@@ -19,11 +24,33 @@ public class PostHandleVO extends PostHandleEntity {
     private static final long serialVersionUID = 1L;
 
     //用户名
+    @Schema(description = "用户名")
     private String userName;
-
     //用户工号
+    @Schema(description = "用户工号")
     private String userCode;
-
     //班组名
+    @Schema(description = "班组名")
     private String deptName;
+    //状态名
+    @Schema(description = "状态名")
+    private String phStatusName;
+    //用工类型名
+    @Schema(description = "用工类型名")
+    private String staffTypeName;
+    //技能等级名
+    @Schema(description = "技能等级名")
+    private String skillName;
+
+    public String getPhStatusName() {
+        return PostHandleStatusEnum.getName(null != this.getPhStatus() ? this.getPhStatus().intValue() : null);
+    }
+
+    public String getStaffTypeName() {
+        return StaffTypeEnum.getName(null != this.getStaffType() ? this.getStaffType().intValue() : null);
+    }
+
+    public String getSkillName() {
+        return SkillEnum.getName(null != this.getSkill() ? this.getSkill().intValue() : null);
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml

@@ -49,7 +49,7 @@
         <!-- 关联字段映射 -->
         <result property="name" column="name"/>
         <result property="code" column="code"/>
-        <result property="staffTypeName" column="staff_type"/>
+        <result property="staffType" column="staff_type"/>
         <result property="cycle" column="cycle"/>
         <result property="earlyWarningDay" column="early_warning_day"/>
         <result property="planName" column="plan_name"/>