From 182994104da4b8ac8a73105970454af5f6cfa0fe Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 22 Apr 2025 13:35:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E6=8A=A5=E6=95=B0=E6=8D=AE=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IncomeInvoiceServiceImpl.java | 170 ++++++++++-------- 1 file changed, 96 insertions(+), 74 deletions(-) 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 29eef34c..ac0e2b82 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 @@ -36,6 +36,7 @@ import com.hzya.frame.basedao.service.impl.BaseService; import javax.net.ssl.SSLContext; import java.io.IOException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; @@ -686,85 +687,106 @@ public class IncomeInvoiceServiceImpl extends BaseService jnlist = incomeInvoiceDao.queryZtzz(jnentity); - if(jnlist != null && jnlist.size() == 1){ - dyAloneId = jnlist.get(0); - }else { - return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据，不推送"); - } - //查询帐套组织 - IncomeInvoiceEntity qnentity = new IncomeInvoiceEntity(); - qnentity.setDataSourceCode(""); - qnentity.setSysData(jnDate); - qnentity.setOrgCode(orgCode); - List qnlist = incomeInvoiceDao.queryZtzz(qnentity); - if(qnlist != null && qnlist.size() == 1){ - qnAloneId = qnlist.get(0); - }else { - logger.info("未查询到当月的财报数据"); - } - - //查找今年数据 - IncomeInvoiceEntity jnquerydata = new IncomeInvoiceEntity(); - jnquerydata.setDataSourceCode(""); - jnquerydata.setAloneId(dyAloneId.getAloneId()); - List dydataList = incomeInvoiceDao.queryByAloneId(jnquerydata); - if(dydataList != null && dydataList.size() == 1){ - dydata = dydataList.get(0); - }else { - return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据，不推送"); - } - - //查找去年数据 - IncomeInvoiceEntity qnquerydata = new IncomeInvoiceEntity(); - qnquerydata.setDataSourceCode(""); - qnquerydata.setAloneId(qnAloneId.getAloneId()); - List qndataList = incomeInvoiceDao.queryByAloneId(qnquerydata); - if(qndataList != null && qndataList.size() == 1){ - qndata = qndataList.get(0); - } - //拼接数据 - return BaseResult.getSuccessMessageEntity("执行成功"); + + //JSONObject jsonObject = requestJson.getJSONObject("jsonStr"); + //String cdDate = null; + //String jnDate = null; + //String qnDate = null; + //String orgCode = "X0644"; + //IncomeInvoiceEntity dyAloneId = null; + //JSONObject dydata = null; + //JSONObject qndata = null; + //IncomeInvoiceEntity qnAloneId = null; + //if(requestJson.getString("orgCode") != null){ + // orgCode = requestJson.getString("orgCode"); + //} + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + //if(requestJson.getString("year") != null && requestJson.getString("month") != null){ + // cdDate = requestJson.getString("year") + "-" + requestJson.getString("month"); + // if("13".equals(requestJson.getString("month"))){ + // cdDate = requestJson.getString("year") + "-12"; + // qnDate = (requestJson.getInteger("year")-1) + "-12"; + // }else { + // cdDate = requestJson.getString("year") + "-" + requestJson.getString("month"); + // qnDate = (requestJson.getInteger("year")-1) + "-" + requestJson.getString("month"); + // } + //}else { + // cdDate = sdf.format(new Date()); + // jnDate = sdf.format(new Date()); + // Calendar calendar = Calendar.getInstance(); + // calendar.setTime(new Date()); + // calendar.add(Calendar.YEAR, -1); + // Date qn = calendar.getTime(); + // qnDate = sdf.format(qn); + //} + // + ////查询帐套组织 + //IncomeInvoiceEntity jnentity = new IncomeInvoiceEntity(); + //jnentity.setDataSourceCode(""); + //jnentity.setSysData(jnDate); + //jnentity.setOrgCode(orgCode); + //List jnlist = incomeInvoiceDao.queryZtzz(jnentity); + //if(jnlist != null && jnlist.size() == 1){ + // dyAloneId = jnlist.get(0); + //}else { + // return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据，不推送"); + //} + ////查询帐套组织 + //IncomeInvoiceEntity qnentity = new IncomeInvoiceEntity(); + //qnentity.setDataSourceCode(""); + //qnentity.setSysData(jnDate); + //qnentity.setOrgCode(orgCode); + //List qnlist = incomeInvoiceDao.queryZtzz(qnentity); + //if(qnlist != null && qnlist.size() == 1){ + // qnAloneId = qnlist.get(0); + //}else { + // logger.info("未查询到当月的财报数据"); + //} + // + ////查找今年数据 + //IncomeInvoiceEntity jnquerydata = new IncomeInvoiceEntity(); + //jnquerydata.setDataSourceCode(""); + //jnquerydata.setAloneId(dyAloneId.getAloneId()); + //List dydataList = incomeInvoiceDao.queryByAloneId(jnquerydata); + //if(dydataList != null && dydataList.size() == 1){ + // dydata = dydataList.get(0); + //}else { + // return BaseResult.getSuccessMessageEntity("未查询到当月的财报数据，不推送"); + //} + // + // //查找去年数据 + //IncomeInvoiceEntity qnquerydata = new IncomeInvoiceEntity(); + //qnquerydata.setDataSourceCode(""); + //qnquerydata.setAloneId(qnAloneId.getAloneId()); + //List qndataList = incomeInvoiceDao.queryByAloneId(qnquerydata); + //if(qndataList != null && qndataList.size() == 1){ + // qndata = qndataList.get(0); + //} + ////拼接数据 + // + // + // + // + //return BaseResult.getSuccessMessageEntity("执行成功"); } }