diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/schedule/RevokeSyncScheduled.java b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/schedule/RevokeSyncScheduled.java index 72a2cf9..13dc03c 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/revoke/schedule/RevokeSyncScheduled.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/revoke/schedule/RevokeSyncScheduled.java @@ -8,6 +8,11 @@ import com.chinaweal.aiccs.aiccs.revoke.entity.Revokelist; import com.chinaweal.aiccs.aiccs.revoke.mapper.RevokelistMapper; import com.chinaweal.aiccs.aiccs.revoke.service.IEGtRevokeService; import com.chinaweal.aiccs.aiccs.revoke.service.IERevokeService; +import com.chinaweal.aiccs.aiccs.security.entity.PenaltyCaseInfo; +import com.chinaweal.aiccs.aiccs.security.entity.PenaltyEntInfo; +import com.chinaweal.aiccs.aiccs.security.service.IPenaltyCaseInfoService; +import com.chinaweal.aiccs.aiccs.security.service.IPenaltyEntInfoService; +import com.chinaweal.aiccs.common.util.StringUtils; import com.chinaweal.aiccs.redis.RedisService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -65,6 +70,12 @@ public class RevokeSyncScheduled { @Autowired private RedisService redisService; + @Autowired + private IPenaltyEntInfoService penaltyEntInfoService; + + @Autowired + private IPenaltyCaseInfoService penaltyCaseInfoService; + /** * 定时同步吊销数据 * 将REVOKELIST表中未同步的数据根据市场主体类型分别写入E_REVOKE或E_GT_REVOKE表 @@ -207,6 +218,14 @@ public class RevokeSyncScheduled { } // ILLEGACT字段映射:revokelist的REVOKEREA存储吊销原因 eRevoke.setIllegact(revokelist.getRevokeRea()); + if (StringUtils.isBlank(eRevoke.getIllegact())) { + PenaltyEntInfo one = penaltyEntInfoService.lambdaQuery().eq(PenaltyEntInfo::getPripid, revokelist.getPripid()) + .orderByDesc(PenaltyEntInfo::getCreateTime).last("limit 1").one(); + if (one != null) { + PenaltyCaseInfo byId = penaltyCaseInfoService.getById(one.getCaseid()); + eRevoke.setIllegact(byId.getPenalty()); + } + } // REVAUTH字段映射:revokelist的PUNISHORGCN存储处罚机关 eRevoke.setRevauth(revokelist.getPunishOrgCn()); // REVBASIS字段:可以从CASENO或WRITSID获取,此处暂时留空 @@ -225,6 +244,14 @@ public class RevokeSyncScheduled { eGtRevoke.setPripid(revokelist.getPripid()); // REVREA字段映射:revokelist的REVOKEREA存储吊销原因 eGtRevoke.setRevrea(revokelist.getRevokeRea()); + if (StringUtils.isBlank(eGtRevoke.getRevrea())) { + PenaltyEntInfo one = penaltyEntInfoService.lambdaQuery().eq(PenaltyEntInfo::getPripid, revokelist.getPripid()) + .orderByDesc(PenaltyEntInfo::getCreateTime).last("limit 1").one(); + if (one != null) { + PenaltyCaseInfo byId = penaltyCaseInfoService.getById(one.getCaseid()); + eGtRevoke.setRevrea(byId.getPenalty()); + } + } // REVDATE字段映射:revokelist的REVOKEDATE转换为LocalDate if (revokelist.getRevokedate() != null) { eGtRevoke.setRevdate(revokelist.getRevokedate().toLocalDate());