diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/dao/IIncomeInvoiceDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/dao/IIncomeInvoiceDao.java index 8fb161da..10b95891 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/dao/IIncomeInvoiceDao.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/dao/IIncomeInvoiceDao.java @@ -32,5 +32,7 @@ public interface IIncomeInvoiceDao extends IBaseDao List queryZtzz(IncomeInvoiceEntity entity); List queryByAloneId(IncomeInvoiceEntity jnquerydata); + + List queryAccount(IncomeInvoiceEntity jnentity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/dao/impl/IncomeInvoiceDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/dao/impl/IncomeInvoiceDaoImpl.java index 8582aab4..8488fc63 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/dao/impl/IncomeInvoiceDaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/dao/impl/IncomeInvoiceDaoImpl.java @@ -66,5 +66,11 @@ public class IncomeInvoiceDaoImpl extends MybatisGenericDao o = (List) super.selectList(getSqlIdPrifx() + "queryByAloneId", entity); return o; } + + @Override + public List queryAccount(IncomeInvoiceEntity jnentity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryAccountByZq", jnentity); + return o; + } } 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 4646593b..8359a1f0 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 @@ -534,5 +534,183 @@ and a.ALONE_ID = #{aloneId} + + + + + 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 276820a3..5bf32259 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 @@ -65,6 +65,7 @@ public class IncomeInvoiceServiceImpl extends BaseService sendAccountCodeReport(ztbm,cjzq,rwbm));//科目余额 + return BaseResult.getSuccessMessageEntity("数据获取成功"); } if(businessDataStr.getString("dataType").equals("2")){//财报 - String ztbm = businessDataStr.getString("ztCode");//账套编码 - String cjzq = businessDataStr.getString("period");//采集账期 - String rwbm = businessDataStr.getString("taskNo");//任务编码 + if(ztbm == null || "".equals(ztbm)){ return BaseResult.getFailureMessageEntity("账套编码为空"); } @@ -736,6 +739,54 @@ public class IncomeInvoiceServiceImpl extends BaseService jnlist = incomeInvoiceDao.queryAccount(jnentity); + //正常来说数组不存在空的情况 如果为空就直接下发空数组给他们 + JSONObject sendData = new JSONObject(); + sendData.put("accessKey",accessKey); + long timestamp = System.currentTimeMillis(); + sendData.put("timestamp",timestamp); + sendData.put("taskNo",rwbm); + sendData.put("period",cjzq); + String a = YzfSignUtil.signRequest(sendData,accessSecret); + sendData.put("sign",a); + sendData.put("balanceTableList",jnlist); + Map headers = new HashMap<>(); + headers.put("Content-Type", "application/json; charset=utf-8"); + String returndata = sendPost(url, headers, sendData.toJSONString()); + if (returndata != null && JSONObject.isValidObject(returndata)) { + JSONObject dataJson = JSONObject.parseObject(returndata); + if(dataJson != null && dataJson.getString("code") != null && "0".equals( dataJson.getString("code"))){ + JSONObject data = dataJson.getJSONObject("result"); + if(data != null ){ + if(data != null && data.getString("resultCode") != null && "0".equals( data.getString("resultCode"))){ + return BaseResult.getSuccessMessageEntity("执行成功"); + }else { + return BaseResult.getFailureMessageEntity("发送失败:"+data.getString("message")); + } + }else { + return BaseResult.getFailureMessageEntity("发送失败:"+returndata); + } + }else { + return BaseResult.getFailureMessageEntity("发送失败:"+returndata); + } + }else { + return BaseResult.getFailureMessageEntity("发送失败:"+returndata); + } + } + /** * @Author lvleigang