From 4000d338eb164898f162bfbf5cbe3f5bab9e96f9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 06 一月 2026 10:00:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java
index 6b3499a..53d93c0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java
@@ -218,21 +218,21 @@
i++;
continue;
}
- if (!StringUtils.hasLength(largeVolunteerImport.getRegisterDateStr())){
- result.append("第"+i+"行：[", "注册日期"+"]不能为空");
- i++;
- continue;
- }
+// if (!StringUtils.hasLength(largeVolunteerImport.getRegisterDateStr())){
+// result.append("第"+i+"行：[", "注册日期"+"]不能为空");
+// i++;
+// continue;
+// }
if (Objects.isNull(largeVolunteerImport.getTotalServiceDuration())){
result.append("第"+i+"行：[", "总服务时长"+"]不能为空");
i++;
continue;
}
- if (!StringUtils.hasLength(largeVolunteerImport.getJoinTeamDateStr())){
- result.append("第"+i+"行：[", "加入队伍时间"+"]不能为空");
- i++;
- continue;
- }
+// if (!StringUtils.hasLength(largeVolunteerImport.getJoinTeamDateStr())){
+// result.append("第"+i+"行：[", "加入队伍时间"+"]不能为空");
+// i++;
+// continue;
+// }
TLargeVolunteer largeVolunteer = new TLargeVolunteer();
BeanUtils.copyProperties(largeVolunteerImport, largeVolunteer);
@@ -255,20 +255,20 @@
i++;
continue;
}
- try{
- largeVolunteer.setRegisterDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getRegisterDateStr()));
- }catch (Exception e){
- result.append("第"+i+"行：[", "注册日期"+"]格式错误");
- i++;
- continue;
- }
- try{
- largeVolunteer.setJoinTeamDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getJoinTeamDateStr()));
- }catch (Exception e){
- result.append("第"+i+"行：[", "加入队伍时间"+"]格式错误");
- i++;
- continue;
- }
+// try{
+// largeVolunteer.setRegisterDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getRegisterDateStr()));
+// }catch (Exception e){
+// result.append("第"+i+"行：[", "注册日期"+"]格式错误");
+// i++;
+// continue;
+// }
+// try{
+// largeVolunteer.setJoinTeamDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getJoinTeamDateStr()));
+// }catch (Exception e){
+// result.append("第"+i+"行：[", "加入队伍时间"+"]格式错误");
+// i++;
+// continue;
+// }
largeVolunteers.add(largeVolunteer);
i++;
}
--
Gitblit v1.7.1