PartyMemberConstant.MOST) {
- result.concat("10");
- } else if (idCardResult < PartyMemberConstant.SMALL) {
- result.concat("00");
- } else {
- result.concat("01");
- }
+ double nameResult = jw.similarity(baseInfo.getName(), info.getSurname() + info.getName());
+ result = getString(result, idCardResult);
- if (mobileResult > PartyMemberConstant.MOST) {
- result.concat("10");
- } else if (mobileResult < PartyMemberConstant.SMALL) {
- result.concat("00");
- } else {
- result.concat("01");
- }
+ result = getString(result, mobileResult);
- if (nameResult > PartyMemberConstant.MOST) {
- result.concat("10");
- } else if (nameResult < PartyMemberConstant.SMALL) {
- result.concat("00");
- } else {
- result.concat("01");
- }
+ result = getString(result, nameResult);
return result;
}
+ @NotNull
+ private String getString(String result, double comparisonResult) {
+ if(comparisonResult == PartyMemberConstant.EQUALS) {
+ result = result + "11";
+ } else if (comparisonResult > PartyMemberConstant.MOST) {
+ result = result + "10";
+ } else if (comparisonResult < PartyMemberConstant.SMALL) {
+ result = result + "00";
+ } else {
+ result = result + "01";
+ }
+ return result;
+ }
+
}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java
new file mode 100644
index 0000000000..7834468c46
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dto.form;
+
+import com.epmet.dto.UserResiInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 用户居民端注册接口
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-30
+ */
+@Data
+public class ResiInfoSubmitFormDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /**
+ * 客户Id (customer.id)
+ */
+ private String customerId;
+
+ /**
+ * 网格Id (customer_grid.id)
+ */
+ private String gridId;
+
+ /**
+ * 居民注册行为记录表Id resi_visit.id
+ */
+ private String resiVisitId;
+
+ /**
+ * 用户在居民端完善的个人信息
+ */
+ private UserResiInfoDTO resiInfo;
+
+
+}
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 1020d925ff..80aa220e15 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -130,7 +130,7 @@