bug修改

xuhy

2025-12-11 79d5402492a82421b94fcbf90be01adbf3c8e0e5

bug修改

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

@@ -202,50 +202,62 @@
        for (LargeKeyGridUserImport largeKeyGridUserImport : largeKeyGridUserImports) {
            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
                result.append("第"+i+"行：[", "网格"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
                result.append("第"+i+"行：[", "单元号"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
                result.append("第"+i+"行：[", "姓名"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUserSexStr())){
                result.append("第"+i+"行：[", "性别"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getIdCard())){
                result.append("第"+i+"行：[", "身份证号"+"]不能为空");
                i++;
                continue;
            }
            if (largeKeyGridUserImport.getIdCard().matches("^$|(^[1-9]\\\\d{7}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])\\\\d{3}$)|(^[1-9]\\\\d{5}[1-9]\\\\d{3}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])((\\\\d{4})|\\\\d{3}[Xx])$)")){
            if (!largeKeyGridUserImport.getIdCard().matches("^$|(^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$)|(^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])((\\d{4})|\\d{3}[Xx])$)")){
                result.append("第"+i+"行：[", "身份证号"+"]格式不正确");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getContactNumber())){
                result.append("第"+i+"行：[", "联系电话"+"]不能为空");
                i++;
                continue;
            }
            if (largeKeyGridUserImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
            if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getTypeName())){
                result.append("第"+i+"行：[", "类型名称"+"]不能为空");
                i++;
                continue;
            }
            TLargeKeyGridUser largeKeyGridUser = new TLargeKeyGridUser();
@@ -260,6 +272,7 @@
                    break;
                default:
                    result.append("第"+i+"行：[", "性别"+"]格式错误");
                    i++;
                    continue;
            }

@@ -268,6 +281,7 @@
                    .last("LIMIT 1"));
            if(Objects.isNull(largeKeyPersonnelType)){
                result.append("第"+i+"行：[", "类型名称"+"]不存在");
                i++;
                continue;
            }
            largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
@@ -315,46 +329,57 @@
        for (LargeKeyGridUserImport largeKeyGridUserImport : largeKeyGridUserImports) {
            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
                result.append("第"+i+"行：[", "网格"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
                result.append("第"+i+"行：[", "单元号"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
                result.append("第"+i+"行：[", "姓名"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUserSexStr())){
                result.append("第"+i+"行：[", "性别"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getIdCard())){
                result.append("第"+i+"行：[", "身份证号"+"]不能为空");
                i++;
                continue;
            }
            if (largeKeyGridUserImport.getIdCard().matches("^$|(^[1-9]\\\\d{7}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])\\\\d{3}$)|(^[1-9]\\\\d{5}[1-9]\\\\d{3}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])((\\\\d{4})|\\\\d{3}[Xx])$)")){
            if (!largeKeyGridUserImport.getIdCard().matches("^$|(^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$)|(^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])((\\d{4})|\\d{3}[Xx])$)")){
                result.append("第"+i+"行：[", "身份证号"+"]格式不正确");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getContactNumber())){
                result.append("第"+i+"行：[", "联系电话"+"]不能为空");
                i++;
                continue;
            }
            if (largeKeyGridUserImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
            if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
            }
            TLargeKeyGridUser largeKeyGridUser = new TLargeKeyGridUser();
@@ -369,6 +394,7 @@
                    break;
                default:
                    result.append("第"+i+"行：[", "性别"+"]格式错误");
                    i++;
                    continue;
            }

@@ -378,6 +404,7 @@
                        .last("LIMIT 1"));
                if(Objects.isNull(largeKeyPersonnelType)){
                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
                    i++;
                    continue;
                }
                largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());

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

@@ -205,26 +205,32 @@
        for (LargeOrganizationImport largeOrganizationImport : largeOrganizationImports) {
            if (!StringUtils.hasLength(largeOrganizationImport.getOrganizationName())){
                result.append("第"+i+"行：[", "组织名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeOrganizationImport.getOrganizationPerson())){
                result.append("第"+i+"行：[", "组织负责人"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeOrganizationImport.getAddress())){
                result.append("第"+i+"行：[", "地址"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeOrganizationImport.getContactNumber())){
                result.append("第"+i+"行：[", "联系电话"+"]不能为空");
                i++;
                continue;
            }
            if (largeOrganizationImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
            if (!largeOrganizationImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeOrganizationImport.getBusinessScope())){
                result.append("第"+i+"行：[", "业务范围"+"]不能为空");
                i++;
                continue;
            }
            TLargeOrganization largeOrganization = new TLargeOrganization();

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

@@ -201,38 +201,47 @@
        for (LargeResourceImport largeResourceImport : largeResourceImports) {
            if (!StringUtils.hasLength(largeResourceImport.getTypeParentName())){
                result.append("第"+i+"行：[", "一级类型名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeResourceImport.getTypeChildrenName())){
                result.append("第"+i+"行：[", "二级类型名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeResourceImport.getResourceUnit())){
                result.append("第"+i+"行：[", "资源单位"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeResourceImport.getResourceNameDesc())){
                result.append("第"+i+"行：[", "资源名称描述"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeResourceImport.getResourceSource())){
                result.append("第"+i+"行：[", "资源来源"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeResourceImport.getQuantityScale())){
                result.append("第"+i+"行：[", "数量规模"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeResourceImport.getContactPerson())){
                result.append("第"+i+"行：[", "联系人"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeResourceImport.getContactNumber())){
                result.append("第"+i+"行：[", "联系电话"+"]不能为空");
                i++;
                continue;
            }
            if (largeResourceImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
            if (!largeResourceImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
            }
            TLargeResource largeResource = new TLargeResource();
@@ -243,6 +252,7 @@
                    .last("LIMIT 1"));
            if(Objects.isNull(parent)){
                result.append("第"+i+"行：[", "一级类型名称"+"]不存在");
                i++;
                continue;
            }
            largeResource.setTypeParentId(parent.getId());
@@ -252,6 +262,7 @@
                    .last("LIMIT 1"));
            if(Objects.isNull(children)){
                result.append("第"+i+"行：[", "二级类型名称"+"]不存在");
                i++;
                continue;
            }
            largeResource.setTypeChildrenId(children.getId());

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

@@ -5,6 +5,8 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
@@ -38,7 +40,9 @@
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -138,14 +142,16 @@
    @ApiOperation(value = "社会工作者信息导入模板下载")
    @GetMapping("/import-template")
    public void importTemplate() {
        List<LargeSocialWorkerImport> largeLargeSocialWorkerImports = new ArrayList<>();
        LargeSocialWorkerImport largeLargeSocialWorkerImport = new LargeSocialWorkerImport();
        largeLargeSocialWorkerImports.add(largeLargeSocialWorkerImport);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), LargeSocialWorkerImport.class, largeLargeSocialWorkerImports);
        Map<String, Object> result = new HashMap<>();
        ClassPathResource classPathResource = new ClassPathResource("template/社会工作者导入模板.xlsx");
        TemplateExportParams params = new TemplateExportParams(classPathResource.getPath());
        Workbook workbook = ExcelExportUtil.exportExcel(params, result);
        HttpServletResponse response = WebUtils.response();
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("社会工作者信息导入模板.xls", "utf-8");
            String fileName = URLEncoder.encode("社会工作者信息导入模板.xlsx", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setHeader("content-Type", "application/vnd.ms-excel");
            response.setHeader("Pragma", "no-cache");
@@ -196,38 +202,47 @@
        for (LargeSocialWorkerImport largeSocialWorkerImport : largeSocialWorkerImports) {
            if (!StringUtils.hasLength(largeSocialWorkerImport.getUserName())){
                result.append("第"+i+"行：[", "姓名"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeSocialWorkerImport.getUserSexStr())){
                result.append("第"+i+"行：[", "性别"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeSocialWorkerImport.getBirthDateStr())){
                result.append("第"+i+"行：[", "出生日期"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeSocialWorkerImport.getEducationalLevel())){
                result.append("第"+i+"行：[", "文化程度"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeSocialWorkerImport.getPoliticalStatus())){
                result.append("第"+i+"行：[", "政治面貌"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeSocialWorkerImport.getContactNumber())){
                result.append("第"+i+"行：[", "联系电话"+"]不能为空");
                i++;
                continue;
            }
            if (largeSocialWorkerImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
            if (!largeSocialWorkerImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeSocialWorkerImport.getEmployerPosition())){
                result.append("第"+i+"行：[", "工作单位及职务"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeSocialWorkerImport.getQualificationLevelStr())){
                result.append("第"+i+"行：[", "职业资格等级"+"]不能为空");
                i++;
                continue;
            }
            TLargeSocialWorker largeSocialWorker = new TLargeSocialWorker();
@@ -242,6 +257,7 @@
                    break;
                default:
                    result.append("第"+i+"行：[", "性别"+"]格式错误");
                    i++;
                    continue;
            }

@@ -257,12 +273,14 @@
                    break;
                default:
                    result.append("第"+i+"行：[", "职业资格等级"+"]格式错误");
                    i++;
                    continue;
            }
            try{
                largeSocialWorker.setBirthDate(DateUtils.stringToLocalDate(largeSocialWorkerImport.getBirthDateStr()));
            }catch (Exception e){
                result.append("第"+i+"行：[", "出生日期"+"]格式错误");
                i++;
                continue;
            }
            largeSocialWorkers.add(largeSocialWorker);

 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);

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

@@ -206,18 +206,22 @@
        for (MerchantImport merchantImport : merchantImports) {
            if (!StringUtils.hasLength(merchantImport.getMerchantName())){
                result.append("第"+i+"行：[", "商户名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(merchantImport.getMerchantPhone())){
                result.append("第"+i+"行：[", "商户电话"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(merchantImport.getTypeName())){
                result.append("第"+i+"行：[", "商户分类"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(merchantImport.getAddress())){
                result.append("第"+i+"行：[", "商户地址"+"]不能为空");
                i++;
                continue;
            }
            TMerchantType merchantType = merchantTypeService.getOne(Wrappers.lambdaQuery(TMerchantType.class)
@@ -225,6 +229,7 @@
                    .last("LIMIT 1"));
            if(Objects.isNull(merchantType)){
                result.append("第"+i+"行：[", "商户分类"+"]不存在");
                i++;
                continue;
            }
            TMerchant merchant = new TMerchant();

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

@@ -174,22 +174,27 @@
        for (OldsterImport oldsterImport : assetHouseInspectionImports) {
            if (!StringUtils.hasLength(oldsterImport.getOldsterName())){
                result.append("第"+i+"行：[", "老人姓名"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(oldsterImport.getOldsterSexStr())){
                result.append("第"+i+"行：[", "老人性别"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(oldsterImport.getContactPhone())){
                result.append("第"+i+"行：[", "联系方式"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(oldsterImport.getOldsterTypeStr())){
                result.append("第"+i+"行：[", "人员类型"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(oldsterImport.getAddress())){
                result.append("第"+i+"行：[", "居住地址"+"]不能为空");
                i++;
                continue;
            }
            TOldster tOldster = new TOldster();
@@ -200,6 +205,7 @@
                    tOldster.setBirthDate(localDate);
                }catch (Exception e){
                    result.append("第"+i+"行：[", "出生日期"+"]格式错误");
                    i++;
                    continue;
                }
            }

 ruoyi-system/src/main/java/com/ruoyi/system/export/LargeSocialWorkerImport.java

@@ -16,10 +16,12 @@

    @Excel(name = "性别[男|女]", width = 20)
    private String userSexStr;

    private Integer userSex;

    @Excel(name = "出生日期[yyyy-mm-dd]", width = 20)
    private String birthDateStr;

    private LocalDate birthDate;

    @Excel(name = "文化程度", width = 20)
@@ -34,8 +36,9 @@
    @Excel(name = "工作单位及职务", width = 20)
    private String employerPosition;

    @Excel(name = "职业资格等级[助理社会工作师(初级)|社会工作师(中级)|高级社会工作师(高级)]", width = 20)
    @Excel(name = "职业资格等级[助理社会工作师(初级)|社会工作师(中级)|高级社会工作师(高级)]", width = 40)
    private String qualificationLevelStr;

    private Integer qualificationLevel;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeKeyGridUser.java

@@ -65,12 +65,12 @@
    @TableField("user_sex")
    private Integer userSex;

//    @Pattern(regexp = "^$|(^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$)|(^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])((\\d{4})|\\d{3}[Xx])$)",message = "身份证号格式不正确")
    @Pattern(regexp = "^$|(^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$)|(^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])((\\d{4})|\\d{3}[Xx])$)",message = "身份证号格式不正确")
    @ApiModelProperty(value = "身份证号")
    @TableField("id_card")
    private String idCard;

//    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeOrganization.java

@@ -45,7 +45,7 @@
    @TableField("address")
    private String address;

//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeResource.java

@@ -62,7 +62,7 @@
    @TableField("contact_person")
    private String contactPerson;

//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeSocialWorker.java

@@ -57,7 +57,7 @@
    @TableField("political_status")
    private String politicalStatus;

//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeUser.java

@@ -45,7 +45,7 @@
    @TableField("user_name")
    private String userName;

//    @Pattern(regexp = "^1[3-9]\\\\d{9}$",message = "手机号格式不正确")
    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
    @ApiModelProperty(value = "手机号")
    @TableField("user_phone")
    private String userPhone;

 ruoyi-system/src/main/resources/template/社会工作者导入模板.xlsx

Binary files differ