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 512d1a80..0ed7033f 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 @@ -28,5 +28,7 @@ public interface IIncomeInvoiceDao extends IBaseDao int updateMx(IncomeInvoiceEntity incomeInvoiceEntity); int saveMx(IncomeInvoiceEntity incomeInvoiceEntity); + + List queryZtzz(IncomeInvoiceEntity entity); } 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 cc17e4a1..d5a438f6 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 @@ -52,5 +52,14 @@ public class IncomeInvoiceDaoImpl extends MybatisGenericDao queryZtzz(IncomeInvoiceEntity entity) { + List o = (List) super.selectList(getSqlIdPrifx() + "queryZtzz", entity); + return o; + } + + } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.java index 51c2e8e3..27f90943 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/entity/IncomeInvoiceEntity.java @@ -8,6 +8,7 @@ import com.hzya.frame.web.entity.BaseEntity; */ public class IncomeInvoiceEntity extends BaseEntity { + //发票字段 private Integer dataId; private Integer formmainId; private String field0127; @@ -17,6 +18,54 @@ public class IncomeInvoiceEntity extends BaseEntity { private String field0003; + //财报数据 字段 + private String aloneId; + private String sysData; + private String orgCode; + private String orgName; + private String iufoVer; + + + public String getAloneId() { + return aloneId; + } + + public void setAloneId(String aloneId) { + this.aloneId = aloneId; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getOrgCode() { + return orgCode; + } + + public void setOrgCode(String orgCode) { + this.orgCode = orgCode; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getIufoVer() { + return iufoVer; + } + + public void setIufoVer(String iufoVer) { + this.iufoVer = iufoVer; + } + public Integer getDataId() { return dataId; } 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 5ecedcf9..d923d284 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 @@ -53,6 +53,10 @@ kpr , skr , fhr , + url , + ofdurl , + xmlurl , + htbh , @@ -97,7 +101,10 @@ #{kpr} , #{skr} , #{fhr} , - + #{url} , + #{ofdurl} , + #{xmlurl} , + #{htbh} , ) @@ -214,5 +221,19 @@ ) + + + 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 new file mode 100644 index 00000000..0c603f6f --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/incomeInvoiceData/plugin/FinancialReportPluginInitializer.java @@ -0,0 +1,63 @@ +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.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 主数据同步 + * + * @author makejava + * @since 2024-06-21 13:52:35 + */ +public class FinancialReportPluginInitializer extends PluginBaseEntity{ + Logger logger = LoggerFactory.getLogger(FinancialReportPluginInitializer.class); + + @Autowired + private IIncomeInvoiceService incomeInvoiceService; + + @Override + public void initialize() { + logger.info(getPluginLabel() + "执行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "执行销毁方法destroy()"); + } + + @Override + public String getPluginId() { + return "FinancialReportPlugin"; + } + + @Override + public String getPluginName() { + return "FinancialReportPlugin插件"; + } + + @Override + public String getPluginLabel() { + return "FinancialReportPlugin"; + } + + @Override + public String getPluginType() { + return "1"; + } + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) { + try { + logger.info("======开始执行进项全量发票主数据信息同步========"); + return incomeInvoiceService.sendFinancialReportPlugin(requestJson); + }catch (Exception e){ + logger.info("======执行进项全量发票主数据同步失败:{}========",e.getMessage()); + e.printStackTrace(); + } + return null; + } +} 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 08ca551f..2276deeb 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 @@ -12,6 +12,15 @@ import com.hzya.frame.web.entity.JsonResultEntity; * @since 2024-06-21 13:52:35 */ public interface IIncomeInvoiceService extends IBaseService { + /** + * @Author lvleigang + * @Description 全量发票数据 + * @Date 4:28 下午 2025/4/16 + * @param requestJson + * @return com.hzya.frame.web.entity.JsonResultEntity + **/ JsonResultEntity getIncomeInvoiceData(JSONObject requestJson); SysExtensionApiEntity setData(SysExtensionApiEntity entity) throws Exception; + + JsonResultEntity sendFinancialReportPlugin(JSONObject requestJson); } 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 b9d23461..ac801897 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 @@ -1,7 +1,9 @@ package com.hzya.frame.plugin.incomeInvoiceData.service.impl; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity; import com.hzya.frame.plugin.incomeInvoiceData.dao.IIncomeInvoiceDao; import com.hzya.frame.plugin.incomeInvoiceData.entity.IncomeInvoiceEntity; import com.hzya.frame.plugin.incomeInvoiceData.service.IIncomeInvoiceService; @@ -15,6 +17,7 @@ import com.hzya.frame.uuid.UUIDLong; import com.hzya.frame.uuid.UUIDUtils; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; +import org.apache.commons.collections.CollectionUtils; import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -33,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.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -61,6 +65,13 @@ public class IncomeInvoiceServiceImpl extends BaseService 0){ @@ -461,26 +476,28 @@ 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); + if(jsonObject.getString("htbh") != null){ + IncomeInvoiceEntity incomeInvoiceEntity = new IncomeInvoiceEntity(); + incomeInvoiceEntity.setDataSourceCode("master");//todo + //incomeInvoiceEntity.setDataSourceCode("HT-OA");//todo + incomeInvoiceEntity.setField0003(jsonObject.getString("htbh"));//合同号 + incomeInvoiceEntity.setField0127(jsonObject.getString("fpdm"));//发票代码 + incomeInvoiceEntity.setField0128(jsonObject.getString("fphm"));//发票号码 + incomeInvoiceEntity.setField0129(jsonObject.getString("jshj"));//发票总额 + incomeInvoiceEntity.setField0130(jsonObject.getString("fpwj"));//发票文件 todo + List 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(); @@ -488,6 +505,8 @@ public class IncomeInvoiceServiceImpl extends BaseService"); @@ -609,7 +628,7 @@ public class IncomeInvoiceServiceImpl extends BaseService").append(""); stringBuffer.append("").append(""); - stringBuffer.append(jsonObject.getString("fpwj") != null?"":""); + stringBuffer.append(jsonObject.getString("fpwj") != null?"":""); stringBuffer.append("").append(""); @@ -658,5 +677,59 @@ public class IncomeInvoiceServiceImpl extends BaseService list = incomeInvoiceDao.queryZtzz(entity); + if(list != null && list.size() > 0){ + for (int i = 0; i < list.size(); i++) { + //查询数据 + + + + + + + + + } + } + + return BaseResult.getSuccessMessageEntity("执行成功"); + } } diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/incomeInvoiceData/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/incomeInvoiceData/spring/spring-buildpackage-plugin.xml index 2b9e4438..2c2856fe 100644 --- a/base-buildpackage/src/main/resources/cfgHome/plugin/incomeInvoiceData/spring/spring-buildpackage-plugin.xml +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/incomeInvoiceData/spring/spring-buildpackage-plugin.xml @@ -2,4 +2,5 @@ +