From 7a85c2f6df76a012ef0630629b7e1efd19b0fc0c Mon Sep 17 00:00:00 2001
From: purple7433 <zhuxiang@seaskysh.com>
Date: Fri, 1 Nov 2024 17:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=9F=A5=E7=A5=A8=E7=A7=8D=E7=9A=84?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../command/claimAudit/ClaimAuditCmdServiceImpl.java | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
index f5852037..1476e47b 100644
--- a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java
@@ -1768,9 +1768,17 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
}
//todo 0913娉ㄩ噴 0907 鍏堝ocrResult鐨勭粨鏋滃仛鎴彇 锛屽皢\n鏇挎崲鎴愮┖鏍� 锛屽彇鍓�100涓瓧绗� 锛屽幓鍖归厤闄勪欢绫荤殑绁ㄧ鍚嶇О 锛屽鏋滄壘涓嶅埌 鍏ㄩ儴杩斿洖闄勪欢绫荤殑 鏈煡绁ㄧ
ocrResult = stringBuilder.length() > 0 ? stringBuilder.substring(0, stringBuilder.length() - 1) : "";
+ InvoiceSettingAggregate specialAgg = new InvoiceSettingAggregate();
InvoiceSettingAggregate otherAgg = new InvoiceSettingAggregate();
+ boolean isSpecial = false;
Map<String, Object> outMap = new HashMap<>();
for (InvoiceSettingAggregate agg : aggs) {
+ if (ObjectUtil.isNotEmpty(fpTitle)) {
+ if (fpTitle.contains(agg.getInvoiceName())) {
+ specialAgg = agg;
+ isSpecial = true;
+ }
+ }
if ("鏈煡绁ㄧ".equals(agg.getInvoiceName())) {
otherAgg = agg;
}
@@ -1782,6 +1790,9 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
}
}
}
+ if (isSpecial) {
+ otherAgg = specialAgg;
+ }
//todo 娌℃湁鎵惧埌瀵瑰簲鐨勯檮浠剁エ 鎵剧エ绉嶅悕绉版槸 鏈煡绁ㄧ 鐨勫搴斾笂
List<ClaimAuditOcrOut> claimAuditOcrOutList = new ArrayList<>();
--
GitLab