|
@ -18,6 +18,7 @@ |
|
|
package com.elink.esua.epdc.modules.consult.controller; |
|
|
package com.elink.esua.epdc.modules.consult.controller; |
|
|
|
|
|
|
|
|
import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; |
|
|
import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; |
|
|
|
|
|
import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils; |
|
@ -72,13 +73,13 @@ public class GridOperatorInfoController { |
|
|
//效验数据
|
|
|
//效验数据
|
|
|
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|
|
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|
|
//校验身份证
|
|
|
//校验身份证
|
|
|
if(StringUtils.isNotBlank(dto.getIdentityNo())){ |
|
|
if (StringUtils.isNotBlank(dto.getIdentityNo())) { |
|
|
String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo()); |
|
|
String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo()); |
|
|
if (idenNoMsg != null) { |
|
|
if (idenNoMsg != null) { |
|
|
return new Result().error(idenNoMsg); |
|
|
return new Result().error(idenNoMsg); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
dto.setShowFlag("0"); |
|
|
dto.setShowFlag(YesOrNoEnum.NO.value()); |
|
|
gridOperatorInfoService.save(dto); |
|
|
gridOperatorInfoService.save(dto); |
|
|
return new Result(); |
|
|
return new Result(); |
|
|
} |
|
|
} |
|
@ -88,7 +89,7 @@ public class GridOperatorInfoController { |
|
|
//效验数据
|
|
|
//效验数据
|
|
|
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|
|
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); |
|
|
//校验身份证
|
|
|
//校验身份证
|
|
|
if(StringUtils.isNotBlank(dto.getIdentityNo())){ |
|
|
if (StringUtils.isNotBlank(dto.getIdentityNo())) { |
|
|
String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo()); |
|
|
String idenNoMsg = IdentityNoUtils.IdentityNoVerification(dto.getIdentityNo()); |
|
|
if (idenNoMsg != null) { |
|
|
if (idenNoMsg != null) { |
|
|
return new Result().error(idenNoMsg); |
|
|
return new Result().error(idenNoMsg); |
|
|