干部月度考核

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

@@ -165,10 +165,10 @@ public class PersonnelMonthlyAssessmentServiceImpl implements IPersonnelMonthlyA
         for (PersonnelMonthlyAssessment manager : managers) {
             boolean shouldGenerate = false;
             
-            if ("是".equals(manager.getTakeAssessment())) {
+            if ("Y".equals(manager.getTakeAssessment())) {
                 // 条件1：参加考核
                 shouldGenerate = true;
-            } else if ("否".equals(manager.getTakeAssessment())) {
+            } else if ("N".equals(manager.getTakeAssessment())) {
                 // 条件2：不参加考核，但需要检查免考核时间
                 if (manager.getExemptTakeAssessmentStartTime() != null && manager.getExemptTakeAssessmentEndTime() != null) {
                     // 判断免考核时间是否包括整个月份

airport-personnel/src/main/resources/mapper/personnel/PersonnelMonthlyAssessmentMapper.xml

@@ -188,8 +188,8 @@
         LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id
         LEFT JOIN sys_role r ON ur.role_id = r.role_id
         WHERE u.del_flag = '0'
-          AND u.employment_type IN ('派遣工', '正式工')
-          AND r.role_key = 'manager'
+          AND u.employment_type IN ('DISPATCHED_WORKER', 'REGULAR_EMPLOYEE')
+          AND r.role_key = 'jingli'
         ORDER BY u.dept_id, u.user_id
     </select>