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 38be6012..78394b85 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 @@ -70,13 +70,21 @@ public class CInvoiceImportPluginServiceImpl implements ICInvoiceImportPluginSer @Override public String importInvoice(JSONObject requestJson) throws Exception { + //可能是定时任务,也可能是事件触发 + //如果是触发的方式,从jsonStr里取 + JSONObject jsonStrObj = requestJson.getJSONObject("jsonStr"); //1、 查OA主表 String dataSourceCode = requestJson.getString("sourceCode"); if (StrUtil.isEmpty(dataSourceCode)) { dataSourceCode = requestJson.getString("apiDataSourceCode"); } String id = requestJson.getString("id");//主表id 测试的时候用 + if (StrUtil.isEmpty(id)){ + if (null != jsonStrObj){ + id = jsonStrObj.getString("id"); + } + } String start_date_start = requestJson.getString("start_date_start"); String start_date_end = requestJson.getString("start_date_end"); CInvoiceImportHEntity importHEntity = new CInvoiceImportHEntity();