修改新增邀访接口和编辑邀访接口

src/main/java/org/rcisoft/sys/visit/entity/VisitUser.java

@@ -67,6 +67,11 @@ public class VisitUser extends CyIdIncreEntity<VisitUser> {
      */
     private String type;
 
+    /**
+     * 访客状态（0 待填写 1 待提交 2待审核 3未访问 4已访问 5 已失效）
+     */
+    private String state;
+
     private VisitInfoMation visitInfo;
 
     public VisitUser() {

src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java

@@ -176,6 +176,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             }
             u.setVisitId(visitInfomation.getBusinessId());
             u.setNormal();
+            u.setState("0");
             visitUserRepository.insert(u);
         });
         if (synchronization && jieLinkService.pushVisitorData(visitInfomation)) {
@@ -260,6 +261,9 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
         if (visitUsers.size() > 0) {
             userService.deleteByVisitId(visitInfomation.getBusinessId());
             for (VisitUser visitUser : visitUsers) {
+                // 如果存在身份证号，判断身份证号的格式
+                if (StringUtils.isNotEmpty(visitUser.getIdCard()) && !IdCardUtil.isIdcard(visitUser.getIdCard()))
+                    throw new CyServiceException(500, "访客" + visitUser.getUserName() + "身份证号格式不符合规范，请检查!");
                 visitUser.setVisitId(visitInfomation.getBusinessId());
                 userService.persist(visitUser);
             }
@@ -866,9 +870,8 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             List<SysUser> sysUserList = sysUserRepositorys.querySysUsersByPhone(u.getVisitPhone());
             // 不存在新增
             if (CollectionUtils.isEmpty(sysUserList)) {
-                sysUser.setPersonId(UUID.randomUUID().toString());
                 sysUserRepositorys.insert(sysUser);
-                u.setPersonId(sysUser.getPersonId());
+                u.setPersonId(UUID.randomUUID().toString());
                 u.setUserId(sysUser.getBusinessId());
             } else {
                 // 存在覆盖

src/main/java/org/rcisoft/sys/visit/service/impl/VisitUserServiceImpl.java

@@ -26,6 +26,7 @@ import org.rcisoft.sys.visit.dto.*;
 import org.rcisoft.sys.visit.entity.VisitInfoMation;
 import org.rcisoft.sys.visit.entity.VisitUser;
 import org.rcisoft.sys.visit.service.VisitUserService;
+import org.rcisoft.sys.visit.unit.IdCardUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -88,9 +89,8 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository, Visit
         sysUser.setNormal();
         List<SysUser> userList = sysUserRepositorys.querySysUsersByPhone(visitUser.getVisitPhone());
         if (userList.size() == 0) {
-            sysUser.setPersonId(UUID.randomUUID().toString());
             sysUserRepositorys.insert(sysUser);
-            visitUser.setPersonId(sysUser.getPersonId());
+            visitUser.setPersonId(UUID.randomUUID().toString());
             visitUser.setUserId(sysUser.getBusinessId());
         } else {
             // 判断存在的用户是否员工，员工报错
@@ -98,13 +98,13 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository, Visit
                 if (u.getUserType().equals("0"))
                     throw new CyServiceException(500, u.getPhone() + "已被员工绑定,不能成为访客。");
                 if (u.getBlacklistFlag().toString().equals("1")) {
-                    throw new CyServiceException(500, "您已被加入黑名单!");
+                    throw new CyServiceException(500, "不能邀请黑名单内的访客!");
                 }
                 if (!u.getName().equals(sysUser.getName())) {
                     u.setName(sysUser.getName());
                     sysUserRepositorys.updateSysUser(u);
                 }
-                visitUser.setPersonId(u.getPersonId());
+                visitUser.setPersonId(UUID.randomUUID().toString());
                 visitUser.setUserId(u.getBusinessId());
                 break;
             }