diff --git a/.gitignore b/.gitignore index eb7f9414..36470144 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,7 @@ Icon Network Trash Folder Temporary Items .apdisk - +/base-buildpackage/base-buildpackage.iml # ---> Windows # Windows thumbnail cache files Thumbs.db 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 10b95891..095a7b51 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 @@ -26,6 +26,7 @@ public interface IIncomeInvoiceDao extends IBaseDao List queryOaMx(IncomeInvoiceEntity incomeInvoiceEntity); int updateMx(IncomeInvoiceEntity incomeInvoiceEntity); + int updateFP(IncomeInvoiceEntity incomeInvoiceEntity); int saveMx(IncomeInvoiceEntity incomeInvoiceEntity); @@ -34,5 +35,7 @@ public interface IIncomeInvoiceDao extends IBaseDao List queryByAloneId(IncomeInvoiceEntity jnquerydata); List queryAccount(IncomeInvoiceEntity jnentity); + + List queryOaFp(IncomeInvoiceEntity incomeInvoiceEntity); } 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 8488fc63..e5f7fba1 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 @@ -38,6 +38,12 @@ public class IncomeInvoiceDaoImpl extends MybatisGenericDao queryOaFp(IncomeInvoiceEntity entity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryOaFp", entity); + return o; + } + @DS("#entity.dataSourceCode") + @Override public List queryOaMx(IncomeInvoiceEntity entity) { List o = (List) super.selectList(getSqlIdPrifx() + "queryOaMx", entity); return o; @@ -49,6 +55,11 @@ public class IncomeInvoiceDaoImpl extends MybatisGenericDao o = (List) super.selectList(getSqlIdPrifx() + "queryByAloneId", entity); return o; } - + @DS("htBip") @Override public List queryAccount(IncomeInvoiceEntity jnentity) { List o = (List) super.selectList(getSqlIdPrifx() + "queryAccountByZq", jnentity); 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 f1355be3..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 @@ -179,6 +179,15 @@ + + - -- CREATE or replace VIEW V_LPHB_KMFZYE1 AS - select * from ( - SELECT - year, - adjustperiod as period, - year || '-' || adjustperiod as yearperiod, - nt.code AS subjectCode, - oa.name AS subjectName, - oa.dispname as subjectFullName, - ( SELECT code FROM bd_account WHERE pk_account = nt.pid ) as superCode, - case - when balanorient = '1' then '-1' - when balanorient = '0' then '1' - end as subjectDir, - case - when pk_acctype = '0001Z01000000000019S' then 1 - when pk_acctype = '0001Z01000000000019T' then 2 - when pk_acctype = '0001Z01000000000019V' then 3 - when pk_acctype = '0001Z01000000000019U' then 4 - when pk_acctype = '0001Z01000000000019W' then 5 - when pk_acctype = '0001Z01000000000019X' then 6 - end as subjectType, - nt.sumprint_level as subjectLevel, - case - when nt.sumprint_level = '0' then 1 - when nt.sumprint_level != '0' then 0 - end as endLevel, - sum( debitamount ) AS debitValue,-- 本期借方發生額 - sum( localcreditamount ) AS creditValue,-- 本期貸方發生額 - CASE - WHEN sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) ) > 0 THEN'1' - WHEN sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) ) = 0 THEN'0' ELSE '-1' END AS initialSubjectDir, - case - when sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) )>0 then sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) ) - else 0 end AS initialDebitBalanceValue, -- 期初余额借方金额 - case when sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) ) < 0 then sum( qmlocalamount ) - ( sum( localdebitamount ) - sum( localcreditamount ) ) - else 0 end AS initialCreditBalanceValue, -- 期初余额贷方金额 - - CASE - WHEN sum( qmamount ) > 0 THEN'1' - WHEN sum( qmamount ) = 0 THEN'0' ELSE '-1' END AS balanceSubjectDir, - case when sum( qmlocalamount )>0 then sum( qmlocalamount ) - else 0 end as balanceDeditValue, -- 期末余额借方金额 - - case when sum( qmlocalamount )>0 then sum( qmlocalamount ) - else 0 end as balanceCreditValue, -- 期末余额贷方金额 - sum( ljlocaldebitamount ) AS totalDebitValue, - sum( ljlocalcreditamount ) AS totalCreditValue, - org.code GSBM, - org.name GSMC - FROM - ( - SELECT DISTINCT - accperiodmonth.periodyear YEAR, - accperiodmonth.PERIOD ADJUSTPERIOD, - dezz.pk_org, - dezz.pk_accasoa, - dezz.pk_currtype, - dezz.assid assid, - 0 AS localdebitamount, - 0 AS localcreditamount, - 0 AS debitamount, - 0 AS creditamount, - sum( localdebitamount ) AS ljlocaldebitamount, - sum( localcreditamount ) AS ljlocalcreditamount, - sum( debitamount ) AS ljdebitamount, - sum( creditamount ) AS ljcreditamount, - 0 AS qmlocalamount, - 0 AS qmamount - FROM - ( SELECT substr( yearmth, 0, 4 ) periodyear, substr( yearmth, 6, 7 ) period FROM bd_accperiodmonth WHERE yearmth < TO_CHAR( SYSDATE, 'YYYY-MM' ) ) accperiodmonth - LEFT JOIN gl_balance dezz ON dezz.YEAR = accperiodmonth.periodyear - AND dezz.adjustperiod < = accperiodmonth.period - WHERE - voucherkind != 5 - AND voucherkind != 4 - AND dezz.adjustperiod > '00' - GROUP BY - accperiodmonth.periodyear, - accperiodmonth.PERIOD, - dezz.pk_org, - dezz.pk_accasoa, - dezz.pk_currtype, - dezz.assid UNION ALL - SELECT DISTINCT - dezz.YEAR, - dezz.ADJUSTPERIOD, - dezz.pk_org, - dezz.pk_accasoa, - dezz.pk_currtype, - dezz.assid, - sum( localdebitamount ) AS localdebitamount, - sum( localcreditamount ) AS localcreditamount, - sum( debitamount ) AS debitamount, - sum( creditamount ) AS creditamount, - 0 AS ljlocaldebitamount, - 0 AS ljlocalcreditamount, - 0 AS ljdebitamount, - 0 AS ljcreditamount, - 0 AS qmlocalamount, - 0 AS qmamount - FROM - gl_balance dezz - WHERE - voucherkind != 5 - AND voucherkind != 4 - GROUP BY - dezz.YEAR, - dezz.ADJUSTPERIOD, - dezz.pk_org, - dezz.pk_accasoa, - dezz.pk_currtype, - dezz.assid UNION ALL - SELECT DISTINCT - accperiodmonth.periodyear YEAR, - accperiodmonth.PERIOD ADJUSTPERIOD, - dezz.pk_org, - dezz.pk_accasoa, - dezz.pk_currtype, - dezz.assid assid, - 0 AS localdebitamount, - 0 AS localcreditamount, - 0 AS debitamount, - 0 AS creditamount, - 0 AS ljlocaldebitamount, - 0 AS ljlocalcreditamount, - 0 AS ljdebitamount, - 0 AS ljcreditamount, - sum( localdebitamount ) - sum( localcreditamount ) AS qmlocalamount, - sum( debitamount ) - sum( creditamount ) AS qmamount - FROM - ( SELECT substr( yearmth, 0, 4 ) periodyear, substr( yearmth, 6, 7 ) period FROM bd_accperiodmonth WHERE yearmth < TO_CHAR( SYSDATE, 'YYYY-MM' ) ) accperiodmonth - LEFT JOIN gl_balance dezz ON dezz.YEAR = accperiodmonth.periodyear - AND dezz.adjustperiod < = accperiodmonth.period - WHERE - voucherkind != 5 - AND voucherkind != 4 - AND dezz.adjustperiod >= '00' - AND dezz.adjustperiod != '12A' - GROUP BY - accperiodmonth.periodyear, - accperiodmonth.PERIOD, - dezz.pk_org, - dezz.pk_accasoa, - dezz.pk_currtype, - dezz.assid - ) a - LEFT JOIN org_orgs org ON org.pk_org = a.pk_org - LEFT JOIN bd_accasoa oa ON oa.pk_accasoa = a.pk_accasoa - LEFT JOIN bd_account nt ON nt.pk_account = oa.pk_account - LEFT JOIN bd_currtype currtype ON a.pk_currtype = currtype.pk_currtype - LEFT JOIN gl_docfree1 fr1 ON fr1.assid = a.assid - where adjustperiod != '12A' - and adjustperiod >= '00' - and adjustperiod != '00' - GROUP BY - year, - adjustperiod, - nt.code , - oa.name , - oa.dispname, - nt.pid, - balanorient, - pk_acctype, - org.code, - org.name, - nt.sumprint_level - )m1 + select * from V_LPHB_KMFZYE and gsbm = #{orgCode} - and yearperiod = {sysData} + and yearperiod = #{sysData} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java index d10e99f8..51ae2f1a 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java @@ -3,7 +3,6 @@ package com.hzya.frame.plugin.incomeInvoiceData.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.plugin.incomeInvoiceData.service.IIncomeInvoiceService; -import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,8 +53,8 @@ public class FinancialReportPluginInitializer extends PluginBaseEntity{ public JsonResultEntity executeBusiness(JSONObject requestJson) { try { logger.info("======开始执行财务信息同步========"); - return BaseResult.getSuccessMessageEntity("数据获取成功"); - //return incomeInvoiceService.sendFinancialReportPlugin(requestJson); + //return BaseResult.getSuccessMessageEntity("数据获取成功"); + return incomeInvoiceService.sendFinancialReportPlugin(requestJson); }catch (Exception e){ logger.info("======执行财务同步失败:{}========",e.getMessage()); e.printStackTrace(); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/IIncomeInvoiceService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/IIncomeInvoiceService.java index 2276deeb..3f86b160 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/IIncomeInvoiceService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/service/IIncomeInvoiceService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.IBaseService; import com.hzya.frame.plugin.incomeInvoiceData.entity.IncomeInvoiceEntity; import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity; +import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity; import com.hzya.frame.web.entity.JsonResultEntity; /** @@ -21,6 +22,7 @@ public interface IIncomeInvoiceService extends IBaseService parametersMap = new HashMap<>(); @@ -452,37 +472,181 @@ public class IncomeInvoiceServiceImpl extends BaseService list = incomeInvoiceDao.queryOaZb(incomeInvoiceEntity); - if(list != null && list.size() == 1){ - incomeInvoiceEntity.setFormmainId(list.get(0).getDataId()); - } - List mxlist = incomeInvoiceDao.queryOaMx(incomeInvoiceEntity); - if(mxlist != null && mxlist.size() == 1){ - incomeInvoiceEntity.setDataId(mxlist.get(0).getDataId()); - incomeInvoiceDao.updateMx(incomeInvoiceEntity); - } - if(mxlist == null || mxlist.size() == 0){ - incomeInvoiceEntity.setDataId(1); - incomeInvoiceDao.saveMx(incomeInvoiceEntity); - } - } + } catch (Exception e) { e.printStackTrace(); } return entity; } + public JSONObject fileUpload(File file) { + if (null != file) { + try { + HashMap paramMap = new HashMap<>(); + String loginName = "hzya"; + paramMap.put("file", file); + String url = "/seeyon/rest/attachment?token=@token@";//如果后面加上applicationCategory=1&extensions=&firstSave=true，附件业务自动生成一条记录 + url = url.replaceAll("@token@", getOAToken(loginName)); + String result = HttpUtil.post("http://60.204.152.210" + url, paramMap); + if (StrUtil.isNotBlank(result)) { + JSONObject jsonObject = JSONObject.parseObject(result); + String atts = jsonObject.get("atts").toString(); + if (StrUtil.isNotEmpty(atts)) { + JSONArray jsonArray = JSONArray.parseArray(atts); + JSONObject res = (JSONObject) jsonArray.get(0); + String fileUrl = res.getString("fileUrl"); + logger.info("附件id:" + fileUrl); + return res; + } + } + }catch (Exception e){ + logger.error("附件上传失败"+e.getMessage()); + } + } + return null; + } + + private String sendFileUpload(String url,String filename) { + try { + // 获取文件字节数据 + byte[] fileBytes = downloadFileBytes(url); + if (fileBytes != null) { + // 模拟一个文件 + File tempFile = new File(filename); + try (FileOutputStream fos = new FileOutputStream(tempFile)) { + fos.write(fileBytes); + } + + JSONObject data = fileUpload(tempFile); + String fileUrl = null; + if(data != null && data.getString("fileUrl") != null && !"".equals(data.getString("fileUrl")) ){ + fileUrl = data.getString("fileUrl"); + } + // 操作完成后删除临时文件 + tempFile.deleteOnExit(); + return fileUrl; + } + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + public byte[] downloadFileBytes(String fileUrl) throws IOException { + URL url = new URL(fileUrl); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setRequestMethod("GET"); + try (InputStream inputStream = connection.getInputStream(); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { + byte[] buffer = new byte[4096]; + int bytesRead; + while ((bytesRead = inputStream.read(buffer)) != -1) { + outputStream.write(buffer, 0, bytesRead); + } + return outputStream.toByteArray(); + } + } + + /** + * seeyon流程事件监听后置方法，绑定修改文件 + * @param entity + * @return + * @throws Exception + */ + @Override + public void setDataCallBack(SysMessageManageLogEntity entity) throws Exception { + try { + JSONObject datas = JSONObject.parseObject(entity.getSourceData()); + String bodys = datas.getString("body"); + JSONObject jsonObject = JSONObject.parseObject(bodys); + + String urlData = null; + String ofdurlData = null; + String xmlurlData = null; + if(jsonObject.getString("url") != null){ + urlData = sendFileUpload(jsonObject.getString("url"),jsonObject.getString("fphm")+"url"); + } + if(jsonObject.getString("ofdurl") != null){ + ofdurlData = sendFileUpload(jsonObject.getString("ofdurl"),jsonObject.getString("fphm")+"ofdurl"); + } + if(jsonObject.getString("xmlurl") != null){ + xmlurlData = sendFileUpload(jsonObject.getString("xmlurl"),jsonObject.getString("fphm")+"xmlurl"); + } + //urlData = "7908556313791579509"; + //ofdurlData = "7908556313791579509"; + //xmlurlData = "7908556313791579509"; + if(jsonObject.getString("fphm") != null){ + IncomeInvoiceEntity incomeInvoiceEntity = new IncomeInvoiceEntity(); + incomeInvoiceEntity.setDataSourceCode("HT-OA"); + incomeInvoiceEntity.setField0128(jsonObject.getString("fphm"));//发票号码 + incomeInvoiceEntity.setField0130(urlData);//发票文件 + incomeInvoiceEntity.setField0138(ofdurlData);//发票文件 + incomeInvoiceEntity.setField0139(xmlurlData);//发票文件 + List list = incomeInvoiceDao.queryOaFp(incomeInvoiceEntity); + if(list != null && list.size() == 1){ + incomeInvoiceEntity.setDataId(list.get(0).getDataId()); + if(urlData != null){ + //保存关联表 + String urluuid = String.valueOf(UUID.randomUUID().getLeastSignificantBits()); + ctpAttachmentService.saveAttachment(urlData,list.get(0).getDataId().toString(),urluuid,incomeInvoiceEntity.getDataSourceCode()); + } + if(ofdurlData != null){ + //保存关联表 + String urluuid = String.valueOf(UUID.randomUUID().getLeastSignificantBits()); + ctpAttachmentService.saveAttachment(ofdurlData,list.get(0).getDataId().toString(),urluuid,incomeInvoiceEntity.getDataSourceCode()); + } + if(xmlurlData != null){ + //保存关联表 + String urluuid = String.valueOf(UUID.randomUUID().getLeastSignificantBits()); + ctpAttachmentService.saveAttachment(xmlurlData,list.get(0).getDataId().toString(),urluuid,incomeInvoiceEntity.getDataSourceCode()); + } + incomeInvoiceDao.updateFP(incomeInvoiceEntity); + } + } + //修改明细表 + if(jsonObject.getString("htbh") != null){ + IncomeInvoiceEntity incomeInvoiceEntity = new IncomeInvoiceEntity(); + incomeInvoiceEntity.setDataSourceCode("HT-OA"); + incomeInvoiceEntity.setField0003(jsonObject.getString("htbh"));//合同号 + incomeInvoiceEntity.setField0127(jsonObject.getString("fpdm"));//发票代码 + incomeInvoiceEntity.setField0128(jsonObject.getString("fphm"));//发票号码 + incomeInvoiceEntity.setField0129(jsonObject.getString("jshj"));//发票总额 + incomeInvoiceEntity.setField0130(urlData);//发票文件 + incomeInvoiceEntity.setField0138(ofdurlData);//发票文件 + incomeInvoiceEntity.setField0139(xmlurlData);//发票文件 + List list = incomeInvoiceDao.queryOaZb(incomeInvoiceEntity); + if(list != null && list.size() == 1){ + incomeInvoiceEntity.setFormmainId(list.get(0).getDataId()); + if(urlData != null){ + //保存关联表 + String urluuid = String.valueOf(UUID.randomUUID().getLeastSignificantBits()); + ctpAttachmentService.saveAttachment(urlData,list.get(0).getDataId().toString(),urluuid,incomeInvoiceEntity.getDataSourceCode()); + } + if(ofdurlData != null){ + //保存关联表 + String urluuid = String.valueOf(UUID.randomUUID().getLeastSignificantBits()); + ctpAttachmentService.saveAttachment(ofdurlData,list.get(0).getDataId().toString(),urluuid,incomeInvoiceEntity.getDataSourceCode()); + } + if(xmlurlData != null){ + //保存关联表 + String urluuid = String.valueOf(UUID.randomUUID().getLeastSignificantBits()); + ctpAttachmentService.saveAttachment(xmlurlData,list.get(0).getDataId().toString(),urluuid,incomeInvoiceEntity.getDataSourceCode()); + } + List mxlist = incomeInvoiceDao.queryOaMx(incomeInvoiceEntity); + if(mxlist != null && mxlist.size() == 1){ + incomeInvoiceEntity.setDataId(mxlist.get(0).getDataId()); + incomeInvoiceDao.updateMx(incomeInvoiceEntity); + } + if(mxlist == null || mxlist.size() == 0){ + incomeInvoiceEntity.setDataId(1); + incomeInvoiceDao.saveMx(incomeInvoiceEntity); + } + } + + } + } catch (Exception e) { + logger.error(e.getMessage()); + } + } @@ -507,7 +671,7 @@ public class IncomeInvoiceServiceImpl extends BaseService"); stringBuffer.append(""); stringBuffer.append(""); - stringBuffer.append(""); + stringBuffer.append(""); stringBuffer.append(""); stringBuffer.append(""); stringBuffer.append(""); @@ -678,7 +842,8 @@ public class IncomeInvoiceServiceImpl extends BaseService jnlist = incomeInvoiceDao.queryAccount(jnentity); + JSONArray balanceTableList = new JSONArray(); + + for(JSONObject jsonObject :jnlist){ + JSONObject balanceTable = new JSONObject(); + balanceTable.put("subjectCode", jsonObject.getString("SUBJECTCODE")); + balanceTable.put("subjectName", jsonObject.getString("SUBJECTNAME")); + //格式化 + String subjectFullName = jsonObject.getString("SUBJECTFULLNAME"); + // 1. 查找第一个反斜杠的位置 + int firstIndex = subjectFullName.indexOf("\\"); + // 2. 截取第一个反斜杠之后的部分（如果存在） + String substring = firstIndex != -1 + ? subjectFullName.substring(firstIndex + 1) + : subjectFullName; + // 3. 将所有剩余的反斜杠替换为下划线 + String result = substring.replace("\\", "_"); + balanceTable.put("subjectFullName",result ); + balanceTable.put("superCode", jsonObject.getString("SUPERCODE")); + balanceTable.put("subjectDir", jsonObject.getString("SUBJECTDIR")); + balanceTable.put("subjectType", jsonObject.getString("SUBJECTTYPE")); + balanceTable.put("subjectLevel", jsonObject.getString("SUBJECTLEVEL")); + balanceTable.put("endLevel", jsonObject.getString("ENDLEVEL")); + balanceTable.put("debitValue", jsonObject.getString("DEBITVALUE")); + balanceTable.put("creditValue", jsonObject.getString("CREDITVALUE")); + balanceTable.put("initialSubjectDir", jsonObject.getString("INITIALSUBJECTDIR")); + balanceTable.put("initialDebitBalanceValue", jsonObject.getString("INITIALDEBITBALANCEVALUE")); + balanceTable.put("initialCreditBalanceValue", jsonObject.getString("INITIALCREDITBALANCEVALUE")); + balanceTable.put("balanceSubjectDir", jsonObject.getString("BALANCESUBJECTDIR")); + balanceTable.put("balanceDeditValue", jsonObject.getString("BALANCEDEDITVALUE")); + balanceTable.put("balanceCreditValue", jsonObject.getString("BALANCECREDITVALUE")); + balanceTable.put("totalDebitValue", jsonObject.getString("TOTALDEBITVALUE")); + balanceTable.put("totalCreditValue", jsonObject.getString("TOTALCREDITVALUE")); + + balanceTableList.add(balanceTable); + } +// logger.info("222222222222222222"); //正常来说数组不存在空的情况 如果为空就直接下发空数组给他们 JSONObject sendData = new JSONObject(); - sendData.put("accessKey",accessKey); - long timestamp = System.currentTimeMillis(); - sendData.put("timestamp",timestamp); +// 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); +// String a = YzfSignUtil.signRequest(sendData,accessSecret); +// sendData.put("sign",a); + sendData.put("balanceTableList",balanceTableList); Map headers = new HashMap<>(); headers.put("Content-Type", "application/json; charset=utf-8"); + logger.info("科目余额开始发送数据"+sendData.toJSONString()); String returndata = sendPost(url, headers, sendData.toJSONString()); + logger.info("科目余额返回数据"+returndata); if (returndata != null && JSONObject.isValidObject(returndata)) { JSONObject dataJson = JSONObject.parseObject(returndata); if(dataJson != null && dataJson.getString("code") != null && "0".equals( dataJson.getString("code"))){ @@ -783,6 +988,8 @@ 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(); @@ -829,6 +1037,7 @@ public class IncomeInvoiceServiceImpl extends BaseService qnlist = incomeInvoiceDao.queryZtzz(qnentity); + //List qnlist = null; if(qnlist != null && qnlist.size() == 1){ qnAloneId = qnlist.get(0); }else { @@ -836,15 +1045,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){ //查找去年数据 @@ -880,7 +1092,7 @@ public class IncomeInvoiceServiceImpl extends BaseService //新增 @DS("#ctpAttachmentEntity.dataSourceCode") CtpAttachmentEntity saveCtpAttachment(CtpAttachmentEntity ctpAttachmentEntity); + } diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/ICtpFileDao.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/ICtpFileDao.java index 47fe57ae..5fbd8c56 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/ICtpFileDao.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/ICtpFileDao.java @@ -11,6 +11,9 @@ import java.util.List; * @Date 2024/6/17 15:21 **/ public interface ICtpFileDao extends IBaseDao { + + + List queryFile(CtpFileEntity ctpFileEntity); /** * * @content 根据附件id查询附加信息 diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/impl/CtpFileDaoImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/impl/CtpFileDaoImpl.java index 7b02c5c6..a4fa6993 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/impl/CtpFileDaoImpl.java +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/impl/CtpFileDaoImpl.java @@ -20,4 +20,14 @@ public class CtpFileDaoImpl extends MybatisGenericDao impl public List queryCtpFileById(CtpFileEntity ctpFileEntity) { return (List) super.selectList("queryCtpFileById",ctpFileEntity); } + + + + @DS("#entity.dataSourceCode") + @Override + public List queryFile(CtpFileEntity entity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryFile", entity); + return o; + } + } diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/entity/CtpFileEntity.xml b/fw-oa/src/main/java/com/hzya/frame/seeyon/entity/CtpFileEntity.xml index 366258d7..e5ccf106 100644 --- a/fw-oa/src/main/java/com/hzya/frame/seeyon/entity/CtpFileEntity.xml +++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/entity/CtpFileEntity.xml @@ -34,7 +34,19 @@ - + select + + from + ctp_file + + id = #{id} + and filename = #{filename} + + + + +