diff --git a/dxhy-common/src/main/java/com/dxhy/common/util/InvoiceUtil.java b/dxhy-common/src/main/java/com/dxhy/common/util/InvoiceUtil.java index 997c6b9d..f87f2c57 100644 --- a/dxhy-common/src/main/java/com/dxhy/common/util/InvoiceUtil.java +++ b/dxhy-common/src/main/java/com/dxhy/common/util/InvoiceUtil.java @@ -203,6 +203,17 @@ public class InvoiceUtil { return valid; } + public static void main(String[] args) { + String fphm ="1033697"; + boolean valid = false; + if (!StringHelper.isBlank(fphm) + && (FPHM8_PATTERN.matcher(fphm).matches() || FPHM10_PATTERN.matcher(fphm).matches())) { + valid = true; + } + System.out.println(valid); + } + + /** * 判断金额是否合法 * diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/entity/TAcOrg.java b/dxhy-core/src/main/java/com/dxhy/core/job/entity/TAcOrg.java index 81bcecea..78c38654 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/entity/TAcOrg.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/entity/TAcOrg.java @@ -88,7 +88,6 @@ public class TAcOrg implements Serializable { private String dataAceId; private String dataAceKey; private Date firstCollectDate; - public Date getFirstCollectDate() { return firstCollectDate; } diff --git a/dxhy-core/src/main/resources/mapper/ConfirmDao.xml b/dxhy-core/src/main/resources/mapper/ConfirmDao.xml index 42de4121..ee373547 100644 --- a/dxhy-core/src/main/resources/mapper/ConfirmDao.xml +++ b/dxhy-core/src/main/resources/mapper/ConfirmDao.xml @@ -19,7 +19,7 @@