|
|
@@ -163,10 +163,22 @@ public class NhIVController {
|
|
|
List<Map> invoices = (List<Map>) txyInvoice.doRecognizeGeneralInvoice(image).get("MixedInvoiceItems");
|
|
|
List<McInvoiceDto> result = invoices.stream().map(item -> {
|
|
|
Map prop = UtilMap.getMap(UtilMap.getMap(item, "SingleInvoiceInfos"), UtilMap.getString(item, "SubType"));
|
|
|
+
|
|
|
+ String kind = UtilMap.getString(item, "TypeDescription");
|
|
|
+ String invoiceName = UtilMap.getString(item, "SubTypeDescription");
|
|
|
+ if (kind.equals("全电发票")) {
|
|
|
+ kind = invoiceName.contains("专用发票") ? "全电专用发票" : "全电普通发票";
|
|
|
+ }
|
|
|
+ if (kind.equals("增值税发票")) {
|
|
|
+ kind = invoiceName.contains("增值税专用发票") ? "增值税专用发票" : "增值税普通发票";
|
|
|
+ if (invoiceName.contains("增值税电子")) {
|
|
|
+ kind = invoiceName.contains("专用发票") ? "增值税电子专用发票" : "增值税电子普通发票";
|
|
|
+ }
|
|
|
+ }
|
|
|
// ppExt: 通用字段定义
|
|
|
McInvoiceDto invoiceDto = McInvoiceDto.builder()
|
|
|
.name(UtilMap.getString(item, "SubTypeDescription"))
|
|
|
- .kindName(UtilMap.getString(item, "TypeDescription"))
|
|
|
+ .kindName(kind)
|
|
|
.kind(UtilMap.getInt(item, "Type"))
|
|
|
.code(UtilMap.getString(prop, "Code"))
|
|
|
.serial(UtilMap.getString(prop, "Number"))
|
lfx