|
@ -165,7 +165,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea |
|
|
//1:热心居民申请行为记录表新增数据
|
|
|
//1:热心居民申请行为记录表新增数据
|
|
|
result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO); |
|
|
result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO); |
|
|
if (!result.success()) { |
|
|
if (!result.success()) { |
|
|
logger.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION); |
|
|
logger.warn(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION); |
|
|
} |
|
|
} |
|
|
ResiWarmheartedResultDTO resiWarmheartedResultDTO = result.getData(); |
|
|
ResiWarmheartedResultDTO resiWarmheartedResultDTO = result.getData(); |
|
|
//2:查询是否已申请热心居民(不查询审核未通过的)
|
|
|
//2:查询是否已申请热心居民(不查询审核未通过的)
|
|
@ -191,7 +191,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea |
|
|
ResiWarmheartedFormDTO.setAuditStatus(ResiWarmheartedVisitConstant.REJECTED); |
|
|
ResiWarmheartedFormDTO.setAuditStatus(ResiWarmheartedVisitConstant.REJECTED); |
|
|
ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(ResiWarmheartedFormDTO); |
|
|
ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(ResiWarmheartedFormDTO); |
|
|
if (null != resiWarmheartedApplyDTO) { |
|
|
if (null != resiWarmheartedApplyDTO) { |
|
|
logger.error(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION); |
|
|
logger.warn(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION); |
|
|
throw new RenException(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION); |
|
|
throw new RenException(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION); |
|
|
} else { |
|
|
} else { |
|
|
//0:调用user服务获取申请人的基本信息
|
|
|
//0:调用user服务获取申请人的基本信息
|
|
@ -409,7 +409,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea |
|
|
//0:先校验数据是否是未审核状态,防止接口测试调用多次
|
|
|
//0:先校验数据是否是未审核状态,防止接口测试调用多次
|
|
|
ResiWarmheartedApplyEntity entity = baseDao.selectById(formDTO.getApplyId()); |
|
|
ResiWarmheartedApplyEntity entity = baseDao.selectById(formDTO.getApplyId()); |
|
|
if (null == entity || !ResiWarmheartedVisitConstant.UNDER_AUDITTING.equals(entity.getAuditStatus())) { |
|
|
if (null == entity || !ResiWarmheartedVisitConstant.UNDER_AUDITTING.equals(entity.getAuditStatus())) { |
|
|
logger.error(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",ResiWarmheartedVisitConstant.AUDIT_EXCEPTION)); |
|
|
logger.warn(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",formDTO.getApplyId(),ResiWarmheartedVisitConstant.AUDIT_EXCEPTION)); |
|
|
throw new RenException(ResiWarmheartedVisitConstant.AUDIT_EXCEPTION); |
|
|
throw new RenException(ResiWarmheartedVisitConstant.AUDIT_EXCEPTION); |
|
|
} |
|
|
} |
|
|
//1:更新热心居民申请表数据
|
|
|
//1:更新热心居民申请表数据
|
|
@ -418,7 +418,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea |
|
|
int num = baseDao.updateById(entity); |
|
|
int num = baseDao.updateById(entity); |
|
|
//2:审核通过的添加热心居民的角色
|
|
|
//2:审核通过的添加热心居民的角色
|
|
|
if (num < NumConstant.ONE) { |
|
|
if (num < NumConstant.ONE) { |
|
|
logger.error(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",ResiWarmheartedVisitConstant.UPDATE_EXCEPTION)); |
|
|
logger.warn(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",formDTO.getApplyId(),ResiWarmheartedVisitConstant.UPDATE_EXCEPTION)); |
|
|
if (StrConstant.SPECIAL_CUSTOMER.equals(tokenDTO.getCustomerId())) { |
|
|
if (StrConstant.SPECIAL_CUSTOMER.equals(tokenDTO.getCustomerId())) { |
|
|
throw new RenException("组长申请数据更新失败,组长角色添加失败"); |
|
|
throw new RenException("组长申请数据更新失败,组长角色添加失败"); |
|
|
} else { |
|
|
} else { |
|
|