diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index d5e6be5621..50658337d2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -217,8 +217,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //将自动认证结果存入党员认证自动审核表 if (confirmAutoDTO != null) { PartymemberConfirmAutoDTO partymemberConfirmAutoDTO = - partymemberConfirmAutoService.getInfoByPartyMemberInfoId(partyMemberInfoEntity.getPartymemberVisitId()); - confirmAutoDTO.setPartymemberInfoId(partyMemberInfoEntity.getPartymemberVisitId()); + partymemberConfirmAutoService.getInfoByPartyMemberInfoId(partyMemberInfoEntity.getId()); + confirmAutoDTO.setPartymemberInfoId(partyMemberInfoEntity.getId()); if (null == partymemberConfirmAutoDTO) { partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO, PartymemberConfirmAutoEntity.class)); @@ -313,7 +313,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService resultDTO.setUserId(partyMemberInfoEntity.getUserId()); resultDTO.setRealName(partyMemberInfoEntity.getSurname() + partyMemberInfoEntity.getName()); resultDTO.setIdCard(partyMemberInfoEntity.getIdCard()); - resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setMobile(partyMemberInfoEntity.getMobile()); resultDTO.setAddress(partyMemberInfoEntity.getStreet() + partyMemberInfoEntity.getEstate() + partyMemberInfoEntity.getBuilding()); resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()); @@ -352,9 +352,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfoEntity.getGridId()); String gridFullPath = ""; if (gridInfoResult.success() && null != gridInfoResult.getData()) { - gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName(), - gridInfoResult.getData().getCommnuityName(), - gridInfoResult.getData().getGridName()); + gridFullPath = String.format("%s-%s-%s", gridInfoResult.getData().getStreetName() == null?"":gridInfoResult.getData().getStreetName(), + gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(), + gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName()); gridFullPath = gridFullPath.replaceAll("--", "").trim(); } resultDTO.setGridFullPath(gridFullPath); @@ -370,7 +370,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService resultDTO.setUserId(partyMemberInfo.getUserId()); resultDTO.setRealName(partyMemberInfo.getSurname() + partyMemberInfo.getName()); resultDTO.setIdCard(partyMemberInfo.getIdCard()); - resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setMobile(partyMemberInfo.getMobile()); resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding()); String failedReason = ""; if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) { @@ -418,7 +418,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService resultDTO.setUserId(partyMemberInfo.getUserId()); resultDTO.setRealName(partyMemberInfo.getSurname() + partyMemberInfo.getName()); resultDTO.setIdCard(partyMemberInfo.getIdCard()); - resultDTO.setMobile(resultDTO.getMobile()); + resultDTO.setMobile(partyMemberInfo.getMobile()); resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding()); resultDTO.setExtraOrganization(partyMemberInfo.getExtraOrganization()); resultDTO.setContactMobile(partyMemberInfo.getExtraCertifierMobile() == null ? "" : partyMemberInfo.getExtraCertifierMobile()); @@ -448,7 +448,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //获取人工审核信息 PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); resultDTO.setCertifyTime(manualEntity.getCreatedTime().getTime()); - resultDTO.setFailedReason(manualEntity.getRefuseReason()); + resultDTO.setRejectedReason(manualEntity.getRefuseReason()); //查询网格信息 Result gridInfoResult = govOrgFeignClient.queryGridInfo(partyMemberInfo.getGridId()); String gridFullPath = "";