diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/CreditArchiveServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/CreditArchiveServiceImpl.java index d9afc0e..e49acf5 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/CreditArchiveServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/CreditArchiveServiceImpl.java @@ -267,10 +267,16 @@ public class CreditArchiveServiceImpl implements CreditArchiveService { return source.stream().map(s -> { AbnormalArchiveVO vo = new AbnormalArchiveVO(); vo.setAbnId(s.getAbnlistid()); - vo.setSpecause(s.getSpecause()); + // 列入原因:优先用 SPEREASONS(中文),码值兜底 + vo.setSpecause(StringUtils.isNotBlank(s.getSpereasons()) + ? s.getSpereasons() : s.getSpecause()); vo.setAbntime(localDateToDate(s.getAbntime())); - vo.setDecorg(s.getDecorg()); - vo.setRemexcpres(s.getRemexcpres()); + // 列入决定机关:优先用 intoDecorg(中文),码值兜底 + vo.setDecorg(StringUtils.isNotBlank(s.getIntoDecorg()) + ? s.getIntoDecorg() : s.getDecorg()); + // 移出原因:优先用 REMREASONS(中文),码值兜底 + vo.setRemexcpres(StringUtils.isNotBlank(s.getRemreasons()) + ? s.getRemreasons() : s.getRemexcpres()); vo.setRemdate(localDateToDate(s.getRemdate())); // 状态判定:有 remdate 即为 "已移出" vo.setStatus(s.getRemdate() != null ? "OUT" : "IN"); @@ -285,11 +291,16 @@ public class CreditArchiveServiceImpl implements CreditArchiveService { return source.stream().map(s -> { SeriousIllegalArchiveVO vo = new SeriousIllegalArchiveVO(); vo.setSerid(s.getIllegallistid()); - // TSSerIllegalList 的列入原因字段名为 serillrea - vo.setSpecause(s.getSerillrea()); + // 列入原因:优先用 LOSTCREDITEXPLAIN(中文),码值(serillrea)兜底 + vo.setSpecause(StringUtils.isNotBlank(s.getLostcreditexplain()) + ? s.getLostcreditexplain() : s.getSerillrea()); vo.setAbntime(localDateToDate(s.getAbntime())); - vo.setDecorg(s.getDecorg()); - vo.setRemexcpres(s.getRemexcpres()); + // 列入决定机关:优先用 decorgCn(中文),码值兜底 + vo.setDecorg(StringUtils.isNotBlank(s.getDecorgCn()) + ? s.getDecorgCn() : s.getDecorg()); + // 移出原因:优先用 LOSTCREDITEXPLAINREM(中文),码值(remexcpres)兜底 + vo.setRemexcpres(StringUtils.isNotBlank(s.getLostcreditexplainrem()) + ? s.getLostcreditexplainrem() : s.getRemexcpres()); vo.setRemdate(localDateToDate(s.getRemdate())); vo.setStatus(s.getRemdate() != null ? "OUT" : "IN"); return vo;