Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_c...

liujie

2026-03-02 e3268ed62b52a90d20ac2e10ffbf7fab6c00f9fd

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java

@@ -200,32 +200,39 @@
        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+"行：[", "注册日期"+"]不能为空");
                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+"行：[", "加入队伍时间"+"]不能为空");
                continue;
            }
//            if (!StringUtils.hasLength(largeVolunteerImport.getJoinTeamDateStr())){
//                result.append("第"+i+"行：[", "加入队伍时间"+"]不能为空");
//                i++;
//                continue;
//            }
            TLargeVolunteer largeVolunteer = new TLargeVolunteer();
            BeanUtils.copyProperties(largeVolunteerImport, largeVolunteer);

@@ -238,26 +245,30 @@
                    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+"行：[", "注册日期"+"]格式错误");
                continue;
            }
            try{
                largeVolunteer.setJoinTeamDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getJoinTeamDateStr()));
            }catch (Exception e){
                result.append("第"+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++;
        }