Feature/zhuxiang

ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java

@@ -1909,6 +1909,8 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
         //    return excuteResult(ocrResult,image,ocrId,SourceEnum.摩明识别.val());
         //}else {
         //todo 内转单票种逻辑
+        boolean usefjTitle = false;
+        String fjTitleFinal = "";
         if (invoiceName.equals("其他发票") || invoiceName.equals("未知")) {
             //todo 0206需求 循环票种大类是 附件类的票据，比较抬头匹配到对应票种
             List<InvoiceSettingAggregate> loopList = new ArrayList<>();
@@ -1954,10 +1956,15 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
                             break;
                         }
                         //todo 再比较fjTitle
-                        //if (!StringUtils.isEmpty(fjTitle) && fjAgg.getInvoiceName().contains(fjTitle)) {
-                        //    invoiceName = fjAgg.getInvoiceName();
-                        //    break;
-                        //}
+                        if (!StringUtils.isEmpty(fjTitle) && fjTitle.contains(fjAgg.getInvoiceName())) {
+                            invoiceName = fjAgg.getInvoiceName();
+                            usefjTitle = true;
+                            fjTitleFinal = stringBuilder.toString();
+                            if (!ObjectUtil.isEmpty(fjTitleFinal)) {
+                                fjTitleFinal = fjTitleFinal.substring(0, fjTitleFinal.length() - 1);
+                            }
+                            break;
+                        }
                     }
                 }
             }
@@ -2020,7 +2027,7 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
                                     }
                                 }
                                 boolean flagInvoiceArr = false;
-                                String fpTitleFormatted = fpTitle.replaceAll("\\(", "（").replace(")", "）");
+                                String fpTitleFormatted = fpTitle.replaceAll("\\(", "（").replace(")", "）").replace("单子", "电子");
                                 String[] invoiceArr = new String[]{"增值税普通发票（电子）", "增值税专用发票（电子）", "增值税电子专用发票", "增值税专用发票", "增值税普通发票", "增值税电子普通发票", "电子发票（增值税普通发票）", "电子发票（增值税专用发票）", "电子发票（普通发票）"};
                                 for (String a : invoiceArr) {
                                     if (fpTitleFormatted.equals(a)) {
@@ -2099,6 +2106,14 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
                     }
                 }
             }
+            //todo 是否用附件title作为发票title的处理
+            if (usefjTitle) {
+                for (ClaimAuditOcrOut out : mainList) {
+                    if (out.getKey().equals("invoiceType")) {
+                        out.setValue(fjTitleFinal);
+                    }
+                }
+            }
             //todo detailList detailMap
             String detailRule = configAgg.getDetail();
             //todo 循环获取detailRule