修改 党员认证提交

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

@@ -47,9 +47,13 @@ public interface PartyMemberConstant {
 	String BENCHMARK = "110010";
 
 	/**
-	 * 比对结果大部分相同最低值
+	 * 比对结果相同
 	 */
+	Double EQUALS = 1.0;
 
+	/**
+	 * 比对结果大部分相同最低值
+	 */
 	Double MOST = 0.8;
 
 	/**

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

@@ -156,6 +156,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
+			userRole.setCustomerId(partyMemberInfoDTO.getCustomerId());
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
 			userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
 			userRole.setApp(partyMemberInfoDTO.getApp());

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

@@ -33,6 +33,7 @@ import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import info.debatty.java.stringsimilarity.JaroWinkler;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -188,7 +189,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 	 * 生成返回结果
 	 *
 	 * @param baseInfo 基本信息
-	 * @param info 录入信息
+	 * @param info     录入信息
 	 * @return PartymemberConfirmAutoDTO
 	 */
 	private PartymemberConfirmAutoDTO getResult(PartymemberBaseInfoEntity baseInfo, PartymemberInfoDTO info) {
@@ -239,33 +240,29 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		JaroWinkler jw = new JaroWinkler();
 		double idCardResult = jw.similarity(baseInfo.getIdCard(), info.getIdCard());
 		double mobileResult = jw.similarity(baseInfo.getMobile(), info.getMobile());
-		double nameResult = jw.similarity(baseInfo.getName(), info.getName());
-		if (idCardResult > 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;
+	}
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java

@@ -126,6 +126,7 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 		//获取角色ID
 		RoleDTO roleDTO = new RoleDTO();
 		roleDTO.setRoleKey(userRoleDTO.getRoleKey());
+		roleDTO.setApp(userRoleDTO.getApp());
 		RoleDTO role = roleService.getRoleByKey(roleDTO);
 		userRoleDTO.setRoleId(role.getId());
 		baseDao.insert(ConvertUtils.sourceToTarget(userRoleDTO, UserRoleEntity.class));