修改

xuhy

2026-01-06 0d216cab5e2026dc6d35a5395e367efc272d7091

 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++;
        }