From 17b8fad8bbf13dd6f6e2c1e300856c52dce4f3ee Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 12 十二月 2025 14:45:36 +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 | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 7dda67b..6b3499a 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
@@ -200,30 +200,37 @@
for (LargeVolunteerImport largeVolunteerImport : largeVolunteerImports) {
if (!StringUtils.hasLength(largeVolunteerImport.getUserName())){
result.append("第"+i+"行：[", "姓名"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeVolunteerImport.getUserSexStr())){
result.append("第"+i+"行：[", "性别"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeVolunteerImport.getBirthDateStr())){
result.append("第"+i+"行：[", "出生日期"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeVolunteerImport.getServiceArea())){
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;
}
TLargeVolunteer largeVolunteer = new TLargeVolunteer();
@@ -238,24 +245,28 @@
break;
default:
result.append("第"+i+"行：[", "性别"+"]格式错误");
+ i++;
continue;
}
try{
largeVolunteer.setBirthDate(DateUtils.stringToLocalDate(largeVolunteerImport.getBirthDateStr()));
}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);
--
Gitblit v1.7.1