Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -44,7 +44,7 @@ public interface PartyMemberConstant {
 	/**
 	 * 党员自动认证是否成功基准
 	 */
-	String BENCHMARK = "110010";
+	String BENCHMARK = "101011";
 
 	/**
 	 * 比对结果相同
@@ -52,14 +52,34 @@ public interface PartyMemberConstant {
 	Double EQUALS = 1.0;
 
 	/**
-	 * 比对结果大部分相同最低值
+	 * 身份证比对结果大部分相同最低值
 	 */
-	Double MOST = 0.8;
+	Double ID_MOST = 0.88;
 
 	/**
-	 * 比对结果小部分相同最低值
+	 * 身份证比对结果小部分相同最低值
 	 */
-	Double SMALL = 0.5;
+	Double ID_SMALL = 0.5;
+
+	/**
+	 * 手机号比对结果大部分相同最低值
+	 */
+	Double MOBILE_MOST = 0.81;
+
+	/**
+	 * 手机号比对结果小部分相同最低值
+	 */
+	Double MOBILE_SMALL = 0.5;
+
+	/**
+	 * 姓名比对结果大部分相同最低值
+	 */
+	Double NAME_MOST = 0.66;
+
+	/**
+	 * 姓名比对结果小部分相同最低值
+	 */
+	Double NAME_SMALL = 0.5;
 
 	/**
 	 * 比对结果相同

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -200,6 +200,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) {
 		//将访问记录更新到热心居民申请行为记录表
 		saveOrUpdateVisit(infoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_EXTRA);

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java

@@ -241,23 +241,23 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		double idCardResult = jw.similarity(baseInfo.getIdCard(), info.getIdCard());
 		double mobileResult = jw.similarity(baseInfo.getMobile(), info.getMobile());
 		double nameResult = jw.similarity(baseInfo.getName(), info.getSurname() + info.getName());
-		result = getString(result, idCardResult);
+		result = getString(result, idCardResult, PartyMemberConstant.ID_MOST, PartyMemberConstant.ID_SMALL);
 
-		result = getString(result, mobileResult);
+		result = getString(result, mobileResult, PartyMemberConstant.MOBILE_MOST, PartyMemberConstant.MOBILE_SMALL);
 
-		result = getString(result, nameResult);
+		result = getString(result, nameResult, PartyMemberConstant.NAME_MOST, PartyMemberConstant.NAME_SMALL);
 
 		return result;
 
 	}
 
 	@NotNull
-	private String getString(String result, double comparisonResult) {
+	private String getString(String result, double comparisonResult, double most, double small) {
 		if (comparisonResult == PartyMemberConstant.EQUALS) {
 			result = result + "11";
-		} else if (comparisonResult > PartyMemberConstant.MOST) {
+		} else if (comparisonResult > most) {
 			result = result + "10";
-		} else if (comparisonResult < PartyMemberConstant.SMALL) {
+		} else if (comparisonResult < small) {
 			result = result + "00";
 		} else {
 			result = result + "01";