From 2eb261814a2407b3481dfe7b995c58d413a18cff Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 十月 2026 16:28:17 +0800
Subject: [PATCH] feat(quality): 质量监督/质量监控流程对齐程序文件并完善导入
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
index 7c05355..eb6fa8a 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
@@ -57,7 +57,7 @@
personTrainingDetailed.setPlanId(planId);
personTrainingDetailed.setState(3);
- personTrainingDetailed.setTrainingDate(i.getTrainingDate());
+ personTrainingDetailed.setTrainingDate(normalizeTrainingDate(i.getTrainingDate()));
personTrainingDetailedList.add(personTrainingDetailed);
@@ -68,6 +68,32 @@
}
}
+ /**
+ * 鍩硅鏃堕棿缁熶竴鎴� yyyy-MM-dd銆�
+ * Excel 閲岃鑷姩璇嗗埆鎴愭棩鏈熺殑鍗曞厓鏍艰鍑烘潵鏄� 2026/3/15锛屾墜宸ュ綍鍏ョ殑鏄� 2026-03-15锛�
+ * 杩欓噷缁熶竴杞崲锛岄伩鍏嶅鍑烘椂鏍煎紡涓嶄竴鑷淬��
+ */
+ private String normalizeTrainingDate(String value) {
+ if (value == null || value.isBlank()) {
+ return value;
+ }
+ String text = value.trim().split("\\s+")[0]
+ .replace('骞�', '-').replace('鏈�', '-').replace("鏃�", "")
+ .replace('/', '-').replace('.', '-');
+ String[] parts = text.split("-");
+ if (parts.length == 3) {
+ try {
+ int year = Integer.parseInt(parts[0].trim());
+ int month = Integer.parseInt(parts[1].trim());
+ int day = Integer.parseInt(parts[2].trim());
+ return String.format("%04d-%02d-%02d", year, month, day);
+ } catch (NumberFormatException ignored) {
+ // 涓嶆槸鍙瘑鍒殑鏃ユ湡鏍煎紡锛屽師鏍蜂繚瀛�
+ }
+ }
+ return value.trim();
+ }
+
@Override
public void deleteAnnualPlanDetailTable(String ids) {
String[] split = ids.split(",");
--
Gitblit v1.9.3