From 36460fd1bf6c031970ca51df32099a292db95957 Mon Sep 17 00:00:00 2001 From: zhouxy Date: Thu, 8 Jan 2026 18:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=87=BA=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AbnListController.java | 56 ++++++++----------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/AbnListController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/AbnListController.java index a5a52de..51a2d72 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/AbnListController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/AbnListController.java @@ -405,46 +405,38 @@ public class AbnListController extends BaseController { .isNotNull(TSAbnList::getRemdate) .orderByDesc(TSAbnList::getLauptime); list = tsAbnListService.list(wrapper); - // 处理移出原因 移出时间在上线前的对应旧系统（泰富）的移出原因 + // 处理移出原因 if (CollectionUtils.isNotEmpty(list)){ for (TSAbnList tsAbnList : list) { String enttype = tsAbnList.getEnttype(); String remexcpres = tsAbnList.getRemexcpres(); - LocalDate date = LocalDate.parse("2021-10-10");// 上线时间 String reas = null; - if (date.isAfter(tsAbnList.getRemdate())){ //旧数据 - if("9100".equals(enttype) || "9200".equals(enttype)){ // 农合 - reas = Constant.OLD_ABN_FARMER_OUT.get(remexcpres); - }else if("9910".equals(enttype)){// 个体 - reas = Constant.OLD_ABN_INDIVIDUAL_OUT.get(remexcpres); - }else {// 企业 - reas = Constant.OLD_ABN_COMPANY_OUT.get(remexcpres); + if("9100".equals(enttype) || "9200".equals(enttype)){ // 农合 + Map remCodeMap = baseCodeService.getBaseCodeMapFormCache("CD78"); + TRBaseCode code = remCodeMap.get(remexcpres); + if(code != null) { + reas = code.getName(); } - // 同时旧的移出机关与列入机关回显为同一个 - tsAbnList.setRemDecorgCn(tsAbnList.getIntoDecorg()); - }else { - if("9100".equals(enttype) || "9200".equals(enttype)){ // 农合 - Map remCodeMap = baseCodeService.getBaseCodeMapFormCache("CD78"); - TRBaseCode code = remCodeMap.get(remexcpres); - if(code != null) { - reas = code.getName(); - } - }else if("9910".equals(enttype)){// 个体 - Map remCodeMap = baseCodeService.getBaseCodeMapFormCache("CD76"); - TRBaseCode code = remCodeMap.get(remexcpres); - if(code != null) { - reas = code.getName(); - } - }else {// 企业 - Map remCodeMap = baseCodeService.getBaseCodeMapFormCache("CD72"); - TRBaseCode code = remCodeMap.get(remexcpres); - if(code != null) { - reas = code.getName(); - } + }else if("9910".equals(enttype)){// 个体 + Map remCodeMap = baseCodeService.getBaseCodeMapFormCache("CD76"); + TRBaseCode code = remCodeMap.get(remexcpres); + if(code != null) { + reas = code.getName(); + } + }else {// 企业 + Map remCodeMap = baseCodeService.getBaseCodeMapFormCache("CD72"); + TRBaseCode code = remCodeMap.get(remexcpres); + if(code != null) { + reas = code.getName(); } - tsAbnList.setRemDecorgCn(gzaiccodeService.getNameByCode(tsAbnList.getRemDecorg())); } - tsAbnList.setRemexcpresCn(reas); + //设置移出机关中文 + String remDecorgCn = StringUtils.isNotEmpty(tsAbnList.getRemDecorg()) + ? tsAbnList.getRemDecorg() : gzaiccodeService.getNameByCode(tsAbnList.getReDecorg()); + tsAbnList.setRemDecorgCn(remDecorgCn); + //设置移出原因中文 + tsAbnList.setRemexcpresCn(StringUtils.isNotEmpty(tsAbnList.getRemreasons()) + ? tsAbnList.getRemreasons() : reas); } } }