|
@ -281,6 +281,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
// 0309:如果是党员徽章去判断居民信息-类别是否是党员
|
|
|
// 0309:如果是党员徽章去判断居民信息-类别是否是党员
|
|
|
|
|
|
String auditRemark=""; |
|
|
BadgeEntity badgeEntity = badgeDao.selectBadgeInfo(EpmetRequestHolder.getLoginUserCustomerId(),certificationAddFormDTO.getBadgeId()); |
|
|
BadgeEntity badgeEntity = badgeDao.selectBadgeInfo(EpmetRequestHolder.getLoginUserCustomerId(),certificationAddFormDTO.getBadgeId()); |
|
|
if (null == badgeEntity) { |
|
|
if (null == badgeEntity) { |
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "徽章信息查询异常", "徽章信息查询异常"); |
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "徽章信息查询异常", "徽章信息查询异常"); |
|
@ -289,6 +290,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { |
|
|
// 如果是党员徽章,去查看居民信息-类别
|
|
|
// 如果是党员徽章,去查看居民信息-类别
|
|
|
IcResiUserDTO icResiUserDTO = SpringContextUtils.getBean(IcResiUserService.class).getByResiId(certificationAddFormDTO.getIdcard()); |
|
|
IcResiUserDTO icResiUserDTO = SpringContextUtils.getBean(IcResiUserService.class).getByResiId(certificationAddFormDTO.getIdcard()); |
|
|
if (null != icResiUserDTO && NumConstant.ONE_STR.equals(icResiUserDTO.getIsParty())) { |
|
|
if (null != icResiUserDTO && NumConstant.ONE_STR.equals(icResiUserDTO.getIsParty())) { |
|
|
|
|
|
auditRemark ="居民信息是党员,徽章申请自动通过"; |
|
|
certificationAddFormDTO.setAutoPassFlag(true); |
|
|
certificationAddFormDTO.setAutoPassFlag(true); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -333,6 +335,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { |
|
|
//审核状态 approved:审核通过,rejected:审核驳回;auditing:审核中
|
|
|
//审核状态 approved:审核通过,rejected:审核驳回;auditing:审核中
|
|
|
badgeAuditFormDTO.setAuditStatus(BadgeConstant.APPROVED); |
|
|
badgeAuditFormDTO.setAuditStatus(BadgeConstant.APPROVED); |
|
|
badgeAuditFormDTO.setCurrentUserId("APP_USER"); |
|
|
badgeAuditFormDTO.setCurrentUserId("APP_USER"); |
|
|
|
|
|
badgeAuditFormDTO.setAuditRemark(auditRemark); |
|
|
autoPassBadge(badgeAuditFormDTO); |
|
|
autoPassBadge(badgeAuditFormDTO); |
|
|
} |
|
|
} |
|
|
Map resultMap=new HashMap(); |
|
|
Map resultMap=new HashMap(); |
|
@ -351,6 +354,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { |
|
|
dto.setStaffId(badgeAuditFormDTO.getCurrentUserId()); |
|
|
dto.setStaffId(badgeAuditFormDTO.getCurrentUserId()); |
|
|
dto.setIsLast(BadgeConstant.YES); |
|
|
dto.setIsLast(BadgeConstant.YES); |
|
|
dto.setAuditTime(new Date()); |
|
|
dto.setAuditTime(new Date()); |
|
|
|
|
|
dto.setAuditRemark(badgeAuditFormDTO.getAuditRemark()); |
|
|
SpringContextUtils.getBean(UserBadgeCertificateRecordService.class).update(dto); |
|
|
SpringContextUtils.getBean(UserBadgeCertificateRecordService.class).update(dto); |
|
|
|
|
|
|
|
|
ResiUserBadgeDTO resiUserBadgeDTO = new ResiUserBadgeDTO(); |
|
|
ResiUserBadgeDTO resiUserBadgeDTO = new ResiUserBadgeDTO(); |
|
|