diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml index d2bf5bd8..706adb7e 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.xml @@ -563,177 +563,10 @@ diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java index 556bf277..523129b0 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/impl/IncomeInvoiceServiceImpl.java @@ -88,7 +88,7 @@ public class IncomeInvoiceServiceImpl extends BaseService jnlist = incomeInvoiceDao.queryZtzz(jnentity); + //List jnlist = null; if(jnlist != null && jnlist.size() == 1){ dyAloneId = jnlist.get(0); }else { - return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据,不推送"); + //return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据,不推送"); } //查询去年当帐套组织 IncomeInvoiceEntity qnentity = new IncomeInvoiceEntity(); @@ -996,6 +997,7 @@ public class IncomeInvoiceServiceImpl extends BaseService qnlist = incomeInvoiceDao.queryZtzz(qnentity); + //List qnlist = null; if(qnlist != null && qnlist.size() == 1){ qnAloneId = qnlist.get(0); }else { @@ -1003,15 +1005,18 @@ public class IncomeInvoiceServiceImpl extends BaseService dydataList = incomeInvoiceDao.queryByAloneId(jnquerydata); - if(dydataList != null && dydataList.size() == 1){ - dydata = dydataList.get(0); - }else { - return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据,不推送"); + if(dyAloneId != null){ + IncomeInvoiceEntity jnquerydata = new IncomeInvoiceEntity(); + jnquerydata.setDataSourceCode("htBip"); + jnquerydata.setAloneId(dyAloneId.getAloneId()); + List dydataList = incomeInvoiceDao.queryByAloneId(jnquerydata); + if(dydataList != null && dydataList.size() == 1){ + dydata = dydataList.get(0); + }else { + //return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据,不推送"); + } } + //查询去年当期的财报数据 if(qnAloneId != null){ //查找去年数据