From 73c1ecf4d7e9cc8a6de62f3ed41691331e2692ee Mon Sep 17 00:00:00 2001
From: zhouxy <zhouxy@example.com>
Date: Mon, 8 Jun 2026 19:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E7=94=A8=E6=A1=A3=E6=A1=88=E7=BB=8F?=
 =?UTF-8?q?=E8=90=A5=E5=BC=82=E5=B8=B8=E3=80=81=E4=B8=A5=E9=87=8D=E8=BF=9D?=
 =?UTF-8?q?=E6=B3=95=E4=BF=A1=E6=81=AF=E8=8A=82=E7=82=B9=E5=88=97=E5=85=A5?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CreditArchiveServiceImpl.java        | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

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;