From deb67d366e394236b9e972c490bccbd26b36f848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=97=E4=BF=9D?= <wangzongbao@seaskysh.com>
Date: Thu, 20 Oct 2022 14:06:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../command/claimAudit/ClaimAuditCmdServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 85aa8015..ee21a1d8 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
@@ -1212,7 +1212,7 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
if (invoiceName.equals("鍏朵粬鍙戠エ") && fjTitle.contains("鏈瘑鍒埌浠讳綍闄勪欢鏍囬淇℃伅") && !StringUtils.isEmpty(image)){
//todo 鏃犵敤淇℃伅
return null;
- }else if (invoiceName.equals("鏈煡") && !fjType.equals("鍥哄畾璧勪骇鍏ュ簱鎶ヨ处鍗�")){
+ }else if (invoiceName.equals("鏈煡") && !"鍥哄畾璧勪骇鍏ュ簱鎶ヨ处鍗�".equals(fjType)){
//todo 璋冪敤閫氱敤鏂囨湰璇嗗埆鎺ュ彛;璇佹槑鏄崟寮犵エ鎹潪鍒囧壊鐨勭エ鎹� 锛岃蛋鏈煡绁ㄧ
return excuteResult(ocrResult,image);
}else {
@@ -1223,7 +1223,7 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
if (invoiceName.equals("鍏朵粬鍙戠エ") && fpTitle.contains("涓婃捣甯�") && StringUtils.isEmpty(image)){
invoiceName = "鍖荤枟绁ㄦ嵁";
}
- if (invoiceName.equals("鏈煡") && fjType.equals("鍥哄畾璧勪骇鍏ュ簱鎶ヨ处鍗�")){
+ if (!StringUtils.isEmpty(fjType) && fjType.equals("鍥哄畾璧勪骇鍏ュ簱鎶ヨ处鍗�")){
invoiceName = "涓婃捣鏉夎揪瀛﹂櫌鍥哄畾璧勪骇楠屾敹鍗�";
}
//todo 鍏朵粬鍙戠エ涔熷睘浜庣粨鏋勫寲鏁版嵁鐨勪竴绉�
--
GitLab
From e16e26d1c5c17b768415bdf77c35a1691239394b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=97=E4=BF=9D?= <wangzongbao@seaskysh.com>
Date: Thu, 20 Oct 2022 14:40:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=AA=8C=E7=9C=9F=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=91=E7=A5=A8=E4=BB=A3=E7=A0=81=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/seasky/seaskyocr/dto/invoice/HeHeInvoiceQry.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/invoice/HeHeInvoiceQry.java b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/invoice/HeHeInvoiceQry.java
index 5d6c608c..2b1784db 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/invoice/HeHeInvoiceQry.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/seaskyocr/dto/invoice/HeHeInvoiceQry.java
@@ -20,11 +20,11 @@ import javax.validation.constraints.NotNull;
@NoArgsConstructor
public class HeHeInvoiceQry extends BaseDto {
- @NotNull( message = "鍙戠エ浠ｇ爜涓嶈兘涓虹┖")
+ //@NotEmpty( message = "鍙戠エ浠ｇ爜涓嶈兘涓虹┖")
@ApiModelProperty(value = "鍙戠エ浠ｇ爜", example = "1")
private String invoice_code;
- @NotNull( message = "鍙戠エ鍙风爜涓嶈兘涓虹┖")
+ @NotEmpty( message = "鍙戠エ鍙风爜涓嶈兘涓虹┖")
@ApiModelProperty(value = "鍙戠エ鍙风爜", example = "1")
private String invoice_no;
@@ -32,7 +32,7 @@ public class HeHeInvoiceQry extends BaseDto {
@ApiModelProperty(value = "寮€绁ㄦ棩鏈�", example = "20190203")
private Integer invoice_date;
- @NotNull( message = "鍙戠エ鍚嶇О涓嶈兘涓虹┖")
+ @NotEmpty( message = "鍙戠エ鍚嶇О涓嶈兘涓虹┖")
@ApiModelProperty(value = "鍙戠エ鍚嶇О", example = "20190203")
private String invoice_name;
--
GitLab