Просмотр исходного кода

fix(hr): 修复职级计算和调整操作中的字段引用错误

- 在JobLevelCalculatorService中添加NCKD_ALIAS字段到查询构建器
- 将NewDynamicAdjustmentOperationPlugIn中的职级序列字段替换为NCKD_ALIAS
- 更新AnnualAdjustmentOperationPlugin中的职级显示逻辑使用正确字段
- 修复BaseInitialOperationPlugIn中职级信息格式化时的字段引用
wyc 1 неделя назад
Родитель
Сommit
b4c71ecf34

+ 3 - 0
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/business/JobLevelCalculatorService.java

@@ -2218,6 +2218,7 @@ public class JobLevelCalculatorService {
         QueryFieldBuilder queryFieldBuilder = QueryFieldBuilder.create()
                 .addIdNumberNameWithExtras(
                         FormConstant.JOBLEVELSEQ,
+                        PositionStructureConstant.NCKD_ALIAS,
                         FormConstant.NCKD_COEFFICIENT,
                         FormConstant.NCKD_SCORE
                 );
@@ -2250,6 +2251,7 @@ public class JobLevelCalculatorService {
                 .addIdNumberNameWithExtras(
                         new String[]{FormConstant.HBJM_JOBLEVELHR},
                         FormConstant.JOBLEVELSEQ,
+                        PositionStructureConstant.NCKD_ALIAS,
                         FormConstant.NCKD_COEFFICIENT,
                         FormConstant.NCKD_SCORE
                 );
@@ -2305,6 +2307,7 @@ public class JobLevelCalculatorService {
                 .addIdNumberNameWithExtras(
                         new String[]{FormConstant.HBJM_JOBLEVELHR},
                         FormConstant.JOBLEVELSEQ,
+                        PositionStructureConstant.NCKD_ALIAS,
                         FormConstant.NCKD_COEFFICIENT,
                         FormConstant.NCKD_SCORE
                 );

+ 1 - 1
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/adjust/NewDynamicAdjustmentOperationPlugIn.java

@@ -422,7 +422,7 @@ public class NewDynamicAdjustmentOperationPlugIn extends AbstractOperationServic
         String jobLeveStr = StrFormatter.format("{}:{}({}级)",
                 person.getString(FormConstant.NAME_KEY),
                 jobLeve.getString(FormConstant.NAME_KEY),
-                jobLeve.getString(FormConstant.JOBLEVELSEQ));
+                jobLeve.getString(PositionStructureConstant.NCKD_ALIAS));
 
         Map<String, String> customData = this.getOperationResult().getCustomData();
         if(customData == null) {

+ 1 - 1
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/annualadjust/AnnualAdjustmentOperationPlugin.java

@@ -232,7 +232,7 @@ public class AnnualAdjustmentOperationPlugin extends AbstractOperationServicePlu
         String jobLeveStr = StrFormatter.format("{}:{}({}级);{}",
                 person.getString(FormConstant.NAME_KEY),
                 jobLeve.getString(FormConstant.NAME_KEY),
-                jobLeve.getString(FormConstant.JOBLEVELSEQ),
+                jobLeve.getString(PositionStructureConstant.NCKD_ALIAS),
                 adjustTypeEnum.getName());
 
         Map<String, String> customData = this.getOperationResult().getCustomData();

+ 1 - 1
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/operate/initial/BaseInitialOperationPlugIn.java

@@ -493,7 +493,7 @@ public abstract class BaseInitialOperationPlugIn extends AbstractOperationServic
         String jobLeveStr = StrFormatter.format("{}:{}({}级)", 
                 person.getString(FormConstant.NAME_KEY),
                 jobLeve.getString(FormConstant.NAME_KEY),
-                jobLeve.getString(FormConstant.JOBLEVELSEQ));
+                jobLeve.getString(PositionStructureConstant.NCKD_ALIAS));
         
         Map<String, String> customData = this.getOperationResult().getCustomData();
         if(customData == null) {