9060 há 3 meses atrás
pai
commit
fd00f21b3e

+ 15 - 2
websrc/com/kingdee/eas/hr/perf/handler/EvaresultAuditBillEditHandlerEx.java

@@ -132,7 +132,9 @@ public class  EvaresultAuditBillEditHandlerEx extends EvaresultAuditBillEditHand
                     String evaResult = object.getString("evaResult.id");
                     //修改后等级
                     String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
-
+                    if(StringUtils.isBlank(auditGradeLevel)){
+                        auditGradeLevel= object.getString("evaResult.gradeLevel");
+                    }
                     body.setId(id);
                     ids.append(id).append(",");
                     allIdList.add(id);
@@ -321,6 +323,9 @@ public class  EvaresultAuditBillEditHandlerEx extends EvaresultAuditBillEditHand
             String evaResult = object.getString("evaResult.id");
             //修改后等级
             String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
+            if(StringUtils.isBlank(auditGradeLevel)){
+                auditGradeLevel= object.getString("evaResult.gradeLevel");
+            }
             BigDecimal l = revLevelMap.get(auditGradeLevel);
             if(Objects.isNull(l)){
                 l=BigDecimal.ZERO;
@@ -335,6 +340,9 @@ public class  EvaresultAuditBillEditHandlerEx extends EvaresultAuditBillEditHand
             String evaResult = object.getString("evaResult.id");
             //修改后等级
             String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
+            if(StringUtils.isBlank(auditGradeLevel)){
+                auditGradeLevel= object.getString("evaResult.gradeLevel");
+            }
             Map<String, Object> map = Maps.newHashMap();
             String key = auditGradeLevel;
             map.put("lens", revLevelMap.get(auditGradeLevel));
@@ -436,6 +444,9 @@ public class  EvaresultAuditBillEditHandlerEx extends EvaresultAuditBillEditHand
                 String evaResult = object.getString("evaResult.id");
                 //修改后等级
                 String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
+                if(StringUtils.isBlank(auditGradeLevel)){
+                    auditGradeLevel= object.getString("evaResult.gradeLevel");
+                }
                 String revLevel = auditGradeLevel;
                 if (StrUtil.isBlank(auditGradeLevel)) {
                     batchMessage.put(fid, "绩效等级为空,请维护");
@@ -653,7 +664,9 @@ public class  EvaresultAuditBillEditHandlerEx extends EvaresultAuditBillEditHand
                 String evaResult = object.getString("evaResult.id");
                 //修改后等级
                 String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
-
+                if(StringUtils.isBlank(auditGradeLevel)){
+                    auditGradeLevel= object.getString("evaResult.gradeLevel");
+                }
                 if (StrUtil.isBlank(auditGradeLevel)) {
                     batchMessage.put(fid, "绩效等级为空,请维护");
                     continue;

+ 15 - 1
websrc/com/kingdee/eas/hr/perf/handler/EvaresultAuditBillEntryListHandlerEx.java

@@ -71,6 +71,9 @@ public class EvaresultAuditBillEntryListHandlerEx extends EvaresultAuditBillEntr
                     String evaResult = object.getString("evaResult.id");
                     //修改后等级
                     String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
+                    if(StringUtils.isBlank(auditGradeLevel)){
+                        auditGradeLevel= object.getString("evaResult.gradeLevel");
+                    }
 
                     body.setId(id);
                     ids.append(id).append(",");
@@ -259,6 +262,9 @@ public class EvaresultAuditBillEntryListHandlerEx extends EvaresultAuditBillEntr
             String evaResult = object.getString("evaResult.id");
             //修改后等级
             String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
+            if(StringUtils.isBlank(auditGradeLevel)){
+                auditGradeLevel= object.getString("evaResult.gradeLevel");
+            }
             BigDecimal l = revLevelMap.get(auditGradeLevel);
             if(Objects.isNull(l)){
                 l=BigDecimal.ZERO;
@@ -273,6 +279,9 @@ public class EvaresultAuditBillEntryListHandlerEx extends EvaresultAuditBillEntr
             String evaResult = object.getString("evaResult.id");
             //修改后等级
             String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
+            if(StringUtils.isBlank(auditGradeLevel)){
+                auditGradeLevel= object.getString("evaResult.gradeLevel");
+            }
             Map<String, Object> map = Maps.newHashMap();
             String key = auditGradeLevel;
             map.put("lens", revLevelMap.get(auditGradeLevel));
@@ -361,6 +370,9 @@ public class EvaresultAuditBillEntryListHandlerEx extends EvaresultAuditBillEntr
                 String evaResult = object.getString("evaResult.id");
                 //修改后等级
                 String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
+                if(StringUtils.isBlank(auditGradeLevel)){
+                    auditGradeLevel= object.getString("evaResult.gradeLevel");
+                }
                 String revLevel = auditGradeLevel;
                 if (StrUtil.isBlank(auditGradeLevel)) {
                     batchMessage.put(fid, "绩效等级为空,请维护");
@@ -573,7 +585,9 @@ public class EvaresultAuditBillEntryListHandlerEx extends EvaresultAuditBillEntr
                 String evaResult = object.getString("evaResult.id");
                 //修改后等级
                 String auditGradeLevel = object.getString("evaResult.auditGradeLevel");
-
+                if(StringUtils.isBlank(auditGradeLevel)){
+                    auditGradeLevel= object.getString("evaResult.gradeLevel");
+                }
                 if (StrUtil.isBlank(auditGradeLevel)) {
                     batchMessage.put(fid, "绩效等级为空,请维护");
                     continue;