人事绩效

airport-personnel/src/main/java/com/sundot/airport/personnel/domain/PersonnelNonCadreMonthlyAssessment.java

@@ -37,7 +37,6 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     private String assessmentMonth;
 
     /** 用户ID */
-    @Excel(name = "用户ID")
     private Long userId;
 
     /** 用户名称 */
@@ -45,7 +44,6 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     private String userName;
 
     /** 大队ID */
-    @Excel(name = "大队ID")
     private Long brigadeId;
 
     /** 大队名称 */
@@ -53,11 +51,9 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     private String brigadeName;
 
     /** 角色ID */
-    @Excel(name = "角色ID")
     private Long roleId;
 
     /** 角色权限字符串 */
-    @Excel(name = "角色权限字符串")
     private String roleKey;
 
     /** 角色名称 */
@@ -124,7 +120,6 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     private String post;
 
     /** 分管班组长id */
-    @Excel(name = "分管班组长id")
     private Long deputyTeamLeaderId;
 
     /** 分管班组长名称 */
@@ -132,7 +127,6 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     private String deputyTeamLeaderName;
 
     /** 分管主管id */
-    @Excel(name = "分管主管id")
     private Long deputySupervisorId;
 
     /** 分管主管 */
@@ -140,7 +134,6 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     private String deputySupervisorName;
 
     /** 分管经理id */
-    @Excel(name = "分管经理id")
     private Long deputyManagerId;
 
     /** 分管经理 */

airport-personnel/src/main/java/com/sundot/airport/personnel/service/impl/PersonnelNonCadreMonthlyAssessmentServiceImpl.java

@@ -478,6 +478,12 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         result.setPunishmentAmount(punishmentAmount);
         // 考核结果+是否豁免+应用方式
+        result.setAssessmentResult("");
+        result.setAssessmentResultRemark("");
+        result.setExemption("");
+        result.setExemptionReasonRemark("");
+        result.setApplicationMethod("");
+        result.setApplicationMethodRemark("");
         if (StrUtil.equals(RoleTypeEnum.SecurityCheck.getCode(), result.getRoleKey())) {
             doSecurityCheck(result);
         } else if (StrUtil.equals(RoleTypeEnum.banzuzhang.getCode(), result.getRoleKey())) {
@@ -554,11 +560,9 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
             if (exemptionRuleOne) {
                 result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getName());
                 result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getDesc());
-                result.setAssessmentResult(null);
             } else if (exemptionRuleTwo) {
                 result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getName());
                 result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getDesc());
-                result.setAssessmentResult(null);
             }
         }
         // 应用方式
@@ -711,11 +715,9 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
             if (exemptionRuleOne) {
                 result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getName());
                 result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getDesc());
-                result.setAssessmentResult(null);
             } else if (exemptionRuleTwo) {
                 result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getName());
                 result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getDesc());
-                result.setAssessmentResult(null);
             }
         }
         // 应用方式
@@ -850,11 +852,9 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 if (exemptionRuleOne) {
                     result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getName());
                     result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getDesc());
-                    result.setAssessmentResult(null);
                 } else if (exemptionRuleTwo) {
                     result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getName());
                     result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getDesc());
-                    result.setAssessmentResult(null);
                 }
             }
         }