Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-admin/src/main/java/com/sundot/airport/web/controller/exam/ExamMonthlyScoreController.java

@@ -14,12 +14,15 @@ import com.sundot.airport.exam.domain.ExamMonthlyScore;
 import com.sundot.airport.exam.dto.ExamMonthlyScoreImportVO;
 import com.sundot.airport.exam.service.IExamMonthlyScoreService;
 import com.sundot.airport.system.service.ISysUserService;
+import org.apache.poi.ss.usermodel.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -182,6 +185,11 @@ public class ExamMonthlyScoreController extends BaseController {
             int rowNum = i + 2;
 
             try {
+                // 判断是否为空行（所有字段都为空）
+                if (isEmptyRow(vo)) {
+                    continue; // 跳过空行
+                }
+
                 // 验证必填字段
                 if (StrUtil.isBlank(vo.getStudentName())) {
                     failureNum++;
@@ -203,8 +211,8 @@ public class ExamMonthlyScoreController extends BaseController {
                     continue;
                 }
 
-                // 转换年月格式
-                String yearMonth = convertYearMonth(vo.getYearMonth());
+                // 转换年月格式为 yyyy-MM
+                String yearMonth = formatYearMonth(vo.getYearMonth());
 
                 // 从缓存中检查是否已存在
                 String key = user.getUserId() + "_" + yearMonth;
@@ -269,32 +277,74 @@ public class ExamMonthlyScoreController extends BaseController {
     }
 
     /**
-     * 转换年月格式
+     * 判断是否为空行（所有字段都为空）
+     */
+    private boolean isEmptyRow(ExamMonthlyScoreImportVO vo) {
+        return StrUtil.isBlank(vo.getYearMonth())
+                && StrUtil.isBlank(vo.getStudentName())
+                && StrUtil.isBlank(vo.getTeam())
+                && StrUtil.isBlank(vo.getJobPosition())
+                && vo.getComprehensiveScore() == null
+                && StrUtil.isBlank(vo.getComprehensiveTime())
+                && vo.getSpecialScore() == null
+                && StrUtil.isBlank(vo.getSpecialTime());
+    }
+
+    /**
+     * 格式化年月为 yyyy-MM 格式（支持多种输入格式）
      */
-    private String convertYearMonth(String yearMonth) {
+    private String formatYearMonth(String yearMonth) {
         if (StrUtil.isBlank(yearMonth)) {
             return yearMonth;
         }
 
         yearMonth = yearMonth.trim();
 
+        // 1. 尝试解析为数字（Excel日期序列号，如46082）
+        try {
+            double serialNumber = Double.parseDouble(yearMonth);
+            if (serialNumber > 1000 && serialNumber < 100000) {
+                Date date = DateUtil.getJavaDate(serialNumber);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+                return sdf.format(date);
+            }
+        } catch (NumberFormatException e) {
+            // 不是数字，继续其他解析方式
+        }
+
+        // 2. 处理中文格式：2026年3月、2026年03月等
         if (yearMonth.contains("年") && yearMonth.contains("月")) {
             yearMonth = yearMonth.replace("年", "-").replace("月", "");
         }
 
+        // 3. 处理点号分隔：2026.03、2026.3等
         if (yearMonth.contains(".")) {
             yearMonth = yearMonth.replace(".", "-");
         }
 
+        // 4. 处理斜杠分隔：2026/03、2026/3等
+        if (yearMonth.contains("/")) {
+            yearMonth = yearMonth.replace("/", "-");
+        }
+
+        // 5. 标准化月份格式
         String[] parts = yearMonth.split("-");
-        if (parts.length == 2) {
-            String month = parts[1];
-            if (month.length() == 1) {
-                month = "0" + month;
+        if (parts.length >= 2) {
+            String year = parts[0].trim();
+            String month = parts[1].trim();
+
+            // 验证年份和月份是否为有效数字
+            if (year.matches("\\d{4}") && month.matches("\\d{1,2}")) {
+                int monthNum = Integer.parseInt(month);
+                if (monthNum >= 1 && monthNum <= 12) {
+                    // 格式化月份为两位数
+                    String formattedMonth = String.format("%02d", monthNum);
+                    return year + "-" + formattedMonth;
+                }
             }
-            yearMonth = parts[0] + "-" + month;
         }
 
+        // 如果无法解析，返回原始值
         return yearMonth;
     }
 }

airport-exam/src/main/java/com/sundot/airport/exam/dto/ExamMonthlyScoreImportVO.java

@@ -13,9 +13,9 @@ import lombok.Data;
 public class ExamMonthlyScoreImportVO {
 
     /**
-     * 年月（格式：2026年3月）
+     * 年月（支持多种格式：2026年3月、2026-03、2026/03、Excel日期等）
      */
-    @Excel(name = "年月")
+    @Excel(name = "年月", width = 20)
     private String yearMonth;
 
     /**

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>