From b5c79604bc7af07835b01a042973e00840ff3059 Mon Sep 17 00:00:00 2001 From: xiangerlin <251481237@qq.com> Date: Sun, 29 Jun 2025 13:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=89=B9=E9=87=8F=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9=20=E5=BC=80=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CInvoiceImportHEntity.java | 19 +++++++++++++++++++ .../cinvoice/entity/CInvoiceImportHEntity.xml | 2 ++ .../impl/CInvoiceImportPluginServiceImpl.java | 4 ++++ .../InvoiceDistributePluginInitializer.java | 7 +++++-- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.java index 600d51ce..52288e89 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.java @@ -24,6 +24,9 @@ public class CInvoiceImportHEntity extends BaseEntity { private String push_status; //推送字段 private String push_field; + //查询日期期间用 + private String start_date_start; + private String start_date_end; public String getTab_name() { return tab_name; @@ -88,4 +91,20 @@ public class CInvoiceImportHEntity extends BaseEntity { public void setPush_field(String push_field) { this.push_field = push_field; } + + public String getStart_date_start() { + return start_date_start; + } + + public void setStart_date_start(String start_date_start) { + this.start_date_start = start_date_start; + } + + public String getStart_date_end() { + return start_date_end; + } + + public void setStart_date_end(String start_date_end) { + this.start_date_end = start_date_end; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml index c7794078..58c381e6 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/entity/CInvoiceImportHEntity.xml @@ -18,6 +18,8 @@ f.id = #{id} and f.bill_code = #{bill_code} + and f.start_date >= #{start_date_start} + and push_status is null -- and start_date >= '2025-05-26' diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java index a5d4a45c..38be6012 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/cinvoice/service/impl/CInvoiceImportPluginServiceImpl.java @@ -77,9 +77,13 @@ public class CInvoiceImportPluginServiceImpl implements ICInvoiceImportPluginSer dataSourceCode = requestJson.getString("apiDataSourceCode"); } String id = requestJson.getString("id");//主表id 测试的时候用 + String start_date_start = requestJson.getString("start_date_start"); + String start_date_end = requestJson.getString("start_date_end"); CInvoiceImportHEntity importHEntity = new CInvoiceImportHEntity(); importHEntity.setDataSourceCode(dataSourceCode); importHEntity.setId(id); + importHEntity.setStart_date_start(start_date_start); + importHEntity.setStart_date_end(start_date_end); List cInvoiceImportHList = cInvoiceImportHService.queryInvoiceList(importHEntity); if (CollectionUtils.isNotEmpty(cInvoiceImportHList)) { ParamAssembler assembler = null; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/plugin/InvoiceDistributePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/plugin/InvoiceDistributePluginInitializer.java index cb978702..524b5921 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/plugin/InvoiceDistributePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/plugin/InvoiceDistributePluginInitializer.java @@ -1234,9 +1234,12 @@ public class InvoiceDistributePluginInitializer extends PluginBaseEntity { JSONObject attribute = attrObj.getJSONObject("attribute"); if (null != attribute && !"0".equals(attribute.getString("code"))){ String message = attribute.getString("message"); + if (StrUtil.isEmpty(message)){ + message = "开票失败"; + } InvoiceEntity invoiceEntity = new InvoiceEntity(); invoiceEntity.setId(data_id); - invoiceEntity.setResult_status(message); + invoiceEntity.setFailure_reason(message); invoiceEntity.setDataSourceCode("HT-OA"); invoiceDao.updateInvoiceResult(invoiceEntity); //查询待办，退回流程用，这里只处理退回的情况，如果要处理提交，要等开票成功后才能提交，去定时查开票结果的定时任务里做 @@ -1246,7 +1249,7 @@ public class InvoiceDistributePluginInitializer extends PluginBaseEntity { ApplyInvoiceEntity applyInvoiceEntity = applyInvoiceService.queryAffair(applyInvoice); if (null != applyInvoiceEntity){ String stepBack = applyInvoiceService.stepBackValueOf(applyInvoiceEntity.getWorkitem_id(), message); - applyInvoiceService.process(stepBack,"8000590006","zzzh"); + applyInvoiceService.process(stepBack,"8000590006","ZZZH"); } } }