优化

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java

@@ -27,6 +27,11 @@ public class MymessageResultDTO implements Serializable {
 	/**
 	 * 消息内容
 	 */
+	private String messageContent;
+
+	/**
+	 * 已读标记
+	 */
 	private String readFlag;
 
 	/**

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

@@ -105,4 +105,19 @@ public interface PartyMemberConstant {
 	 * 审核状态 未通过
 	 */
 	String REJECTED = "rejected";
+
+	/**
+	 * 网格ID
+	 */
+	String ALL = " all";
+
+	/**
+	 * 认证成功
+	 */
+	String CONFIRM_SUCCESS = "0";
+
+	/**
+	 * 认证失败
+	 */
+	String CONFIRM_FAILED = "1";
 }

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

@@ -164,14 +164,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
 
 			//自动认证失败
-			partyMemberInfoEntity.setConfirmResult("1");
+			partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_FAILED);
 			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
 			} else {
 				partymemberInfoService.updateById(partyMemberInfoEntity);
 			}
 
-
 			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode());
 			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg());
 		} else {
@@ -179,17 +178,26 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
 
 			//自动认证成功
-			partyMemberInfoEntity.setConfirmResult("0");
+			partyMemberInfoEntity.setConfirmResult(PartyMemberConstant.CONFIRM_SUCCESS);
 			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
 			} else {
 				partymemberInfoService.updateById(partyMemberInfoEntity);
 			}
 
+			//人工审核数据状态设为通过
+			PartymemberConfirmManualDTO partymemberConfirmManualDTO =
+					partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfoDTO.getId());
+			if (null != partymemberConfirmManualDTO) {
+				partymemberConfirmManualDTO.setAuditStatus(PartyMemberConstant.APPROVED);
+				partymemberConfirmManualService.updateById(ConvertUtils.sourceToTarget(partymemberConfirmManualDTO,
+						PartymemberConfirmManualEntity.class));
+			}
+
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setCustomerId(partyMemberInfoDTO.getCustomerId());
-			userRole.setGridId("all");
+			userRole.setGridId(PartyMemberConstant.ALL);
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
 			userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
 			userRole.setApp(partyMemberInfoDTO.getApp());

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -40,6 +40,7 @@
             pi.CUSTOMER_ID = #{customerId}
           AND pi.GRID_ID = #{gridId}
           AND pi.USER_ID = #{userId}
+          AND pi.CONFIRM_RESULT = '1'
           AND pi.DEL_FLAG = 0
           AND ( pcm.AUDIT_STATUS = 'under_auditting' OR pi.ORGANIZATION_TYPE IS NULL )
     </select>