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 38e58b92..d2bf5bd8 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
@@ -184,7 +184,7 @@
         id as dataId
         from formmain_0705
         <trim prefix="where" prefixOverrides="and">
-            <if test="field0002 != null and field0002 != ''"> and field0002 = #{field0128} </if>
+            <if test="field0128 != null and field0128 != ''"> and field0002 = #{field0128} </if>
         </trim>
     </select>
 
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 8d8e8915..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,7 +22,7 @@ public interface IIncomeInvoiceService extends IBaseService<IncomeInvoiceEntity,
      **/
     JsonResultEntity getIncomeInvoiceData(JSONObject requestJson);
     SysExtensionApiEntity setData(SysExtensionApiEntity entity) throws Exception;
-    SysExtensionApiEntity setDataCallBack(SysExtensionApiEntity entity) throws Exception;
+    void setDataCallBack(SysMessageManageLogEntity 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 4f8e6ab8..89029e5b 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
@@ -17,6 +17,7 @@ import com.hzya.frame.sysnew.comparison.controlsLog.dao.impl.ControlsLogDaoImpl;
 import com.hzya.frame.sysnew.comparison.controlsLog.entity.ControlsLogEntity;
 import com.hzya.frame.sysnew.comparison.dao.IComparisonDao;
 import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
+import com.hzya.frame.sysnew.messageManageLog.entity.SysMessageManageLogEntity;
 import com.hzya.frame.uuid.UUIDLong;
 import com.hzya.frame.uuid.UUIDUtils;
 import com.hzya.frame.web.entity.BaseResult;
@@ -76,24 +77,25 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         this.incomeInvoiceDao = dao;
         this.dao = dao;
     }
-    boolean flags = true;
-    String uploadBalanceTableUrl = "http://oapi.nanofintax.com/api/collect/uploadBalanceTable?accessToken";
-
-    String cbUrl = "http://oapi.nanofintax.com/api/collect/uploadFinancialReport?accessToken=";
-    String dataUrl = "http://oapi.nanofintax.com/api/invoice_receive/fp/v1/query?accessToken=";
-    String tokenUrl = "http://oapi.nanofintax.com/api/getToken";
-    String accessKey = "6X3B526P5HqE6ums";
-    String accessSecret = "34e5fc32ac894a2ba2ade8c3852c7a0a";
-    String taxNo = "91330110MAC5FPUY2U";
-    Integer size = 50;
-
-    //String cbUrl = "http://oapi.nanofintax.com/api/collect/uploadFinancialReport";
-    //String dataUrl = "https://workbench.test.htszny.com/oapi/invoice_receive/fp/v1/query";//全量发票数据
+    //boolean flags = true;
+    //String uploadBalanceTableUrl = "http://oapi.nanofintax.com/api/collect/uploadBalanceTable?accessToken";
+    //String cbUrl = "http://oapi.nanofintax.com/api/collect/uploadFinancialReport?accessToken=";
+    //String dataUrl = "http://oapi.nanofintax.com/api/invoice_receive/fp/v1/query?accessToken=";
     //String tokenUrl = "http://oapi.nanofintax.com/api/getToken";
     //String accessKey = "6X3B526P5HqE6ums";
     //String accessSecret = "34e5fc32ac894a2ba2ade8c3852c7a0a";
     //String taxNo = "91330110MAC5FPUY2U";
     //Integer size = 50;
+
+    boolean flags = false;
+    String uploadBalanceTableUrl = "http://oapi.nanofintax.com/api/collect/uploadBalanceTable?accessToken";
+    String cbUrl = "http://oapi.nanofintax.com/api/collect/uploadFinancialReport";
+    String dataUrl = "https://workbench.test.htszny.com/oapi/invoice_rec/standing/book/queryList";//全量发票数据
+    String tokenUrl = "http://oapi.nanofintax.com/api/getToken";
+    String accessKey = "6X3B526P5HqE6ums";
+    String accessSecret = "34e5fc32ac894a2ba2ade8c3852c7a0a";
+    String taxNo = "91330110MAC5FPUY2U";
+    Integer size = 50;
     @Resource
     private TaskExecutor taskExecutor;
     /**
@@ -465,32 +467,7 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
             sendBody.put("loginName",loginName);
             sendBody.put("dataXml",dataXml);
             entity.setBodys(sendBody.toJSONString());
-            //修改明细表
-            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("url"));//发票文件
-                incomeInvoiceEntity.setField0138(jsonObject.getString("ofdurl"));//发票文件
-                incomeInvoiceEntity.setField0139(jsonObject.getString("xmlurl"));//发票文件
-                List<IncomeInvoiceEntity> list = incomeInvoiceDao.queryOaZb(incomeInvoiceEntity);
-                if(list != null && list.size() == 1){
-                    incomeInvoiceEntity.setFormmainId(list.get(0).getDataId());
-                }
-                List<IncomeInvoiceEntity> 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();
         }
@@ -571,9 +548,10 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
      * @throws Exception
      */
     @Override
-    public SysExtensionApiEntity setDataCallBack(SysExtensionApiEntity entity) throws Exception {
+    public void setDataCallBack(SysMessageManageLogEntity entity) throws Exception {
         try {
-            String bodys = entity.getBodys();
+            JSONObject datas = JSONObject.parseObject(entity.getSourceData());
+            String bodys = datas.getString("body");
             JSONObject jsonObject = JSONObject.parseObject(bodys);
 
             String urlData = null;
@@ -588,11 +566,12 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
             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("master");//todo
-                //incomeInvoiceEntity.setDataSourceCode("HT-OA");//todo
+                incomeInvoiceEntity.setDataSourceCode("HT-OA");
                 incomeInvoiceEntity.setField0128(jsonObject.getString("fphm"));//发票号码
                 incomeInvoiceEntity.setField0130(urlData);//发票文件
                 incomeInvoiceEntity.setField0138(ofdurlData);//发票文件
@@ -621,15 +600,14 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
             //修改明细表
             if(jsonObject.getString("htbh") != null){
                 IncomeInvoiceEntity incomeInvoiceEntity = new IncomeInvoiceEntity();
-                incomeInvoiceEntity.setDataSourceCode("master");//todo
-                //incomeInvoiceEntity.setDataSourceCode("HT-OA");//todo
+                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(jsonObject.getString("url"));//发票文件
-                incomeInvoiceEntity.setField0138(jsonObject.getString("ofdurl"));//发票文件
-                incomeInvoiceEntity.setField0139(jsonObject.getString("xmlurl"));//发票文件
+                incomeInvoiceEntity.setField0130(urlData);//发票文件
+                incomeInvoiceEntity.setField0138(ofdurlData);//发票文件
+                incomeInvoiceEntity.setField0139(xmlurlData);//发票文件
                 List<IncomeInvoiceEntity> list = incomeInvoiceDao.queryOaZb(incomeInvoiceEntity);
                 if(list != null && list.size() == 1){
                     incomeInvoiceEntity.setFormmainId(list.get(0).getDataId());
@@ -661,9 +639,8 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
 
             }
         } catch (Exception e) {
-            e.printStackTrace();
+           logger.error(e.getMessage());
         }
-        return entity;
     }
 
 
diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/ICtpAttachmentDao.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/ICtpAttachmentDao.java
index 5c64e35f..50f9ac70 100644
--- a/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/ICtpAttachmentDao.java
+++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/dao/ICtpAttachmentDao.java
@@ -18,4 +18,5 @@ public interface ICtpAttachmentDao extends IBaseDao<CtpAttachmentEntity,String>
     //新增
     @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 87961648..dcf916d3 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
@@ -3,10 +3,15 @@ package com.hzya.frame.seeyon.dao;
 import com.hzya.frame.basedao.dao.IBaseDao;
 import com.hzya.frame.seeyon.entity.CtpFileEntity;
 
+import java.util.List;
+
 /**
  * @Description seeyon 附件对象
  * @Author xiangerlin
  * @Date 2024/6/17 15:21
  **/
 public interface ICtpFileDao extends IBaseDao<CtpFileEntity,String> {
+
+
+    List<CtpFileEntity> queryFile(CtpFileEntity ctpFileEntity);
 }
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 8b80d3d7..3708e11b 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
@@ -1,5 +1,6 @@
 package com.hzya.frame.seeyon.dao.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
 import com.hzya.frame.seeyon.dao.ICtpAttachmentDao;
 import com.hzya.frame.seeyon.dao.ICtpFileDao;
@@ -7,6 +8,8 @@ import com.hzya.frame.seeyon.entity.CtpAttachmentEntity;
 import com.hzya.frame.seeyon.entity.CtpFileEntity;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Description
  * @Author xiangerlin
@@ -14,4 +17,14 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository()
 public class CtpFileDaoImpl extends MybatisGenericDao<CtpFileEntity,String> implements ICtpFileDao {
+
+
+
+    @DS("#entity.dataSourceCode")
+    @Override
+    public List<CtpFileEntity> queryFile(CtpFileEntity entity) {
+        List<CtpFileEntity> o = (List<CtpFileEntity>) 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 3f3c8cad..312e6a55 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.seeyon.entity.CtpFileEntity">
+<mapper namespace="com.hzya.frame.seeyon.dao.impl.CtpFileDaoImpl">
     <resultMap id="get-CtpFileEntity-result" type="com.hzya.frame.seeyon.entity.CtpFileEntity">
         <!--主键 -->
         <result property="id" column="id" />
@@ -34,7 +34,19 @@
 
 
     <!-- 查询 采用==查询 -->
-    <select id="CtpFileEntity_list_base" resultMap="get-CtpFileEntity-result" parameterType="com.hzya.frame.seeyon.entity.CtpFileEntity">
+    <select id="entity_list_base" resultMap="get-CtpFileEntity-result" parameterType="com.hzya.frame.seeyon.entity.CtpFileEntity">
+    select
+    <include refid="CtpFileEntity_sql"/>
+    from
+    ctp_file
+    <trim prefix="where" prefixOverrides="and">
+        <if test="id != null and id != ''">id = #{id}</if>
+        <if test="filename != null and filename != ''">and filename = #{filename}</if>
+    </trim>
+    </select>
+
+    <!-- 查询 采用==查询 -->
+    <select id="queryFile" resultMap="get-CtpFileEntity-result" parameterType="com.hzya.frame.seeyon.entity.CtpFileEntity">
     select
     <include refid="CtpFileEntity_sql"/>
     from
diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/ICtpFileService.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/ICtpFileService.java
index b34826ef..69d3f583 100644
--- a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/ICtpFileService.java
+++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/ICtpFileService.java
@@ -3,6 +3,8 @@ package com.hzya.frame.seeyon.service;
 import com.hzya.frame.basedao.service.IBaseService;
 import com.hzya.frame.seeyon.entity.CtpFileEntity;
 
+import java.util.List;
+
 /**
  * @Description seeyon 附件
  * @Author xiangerlin
diff --git a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/CtpAttachmentServiceImpl.java b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/CtpAttachmentServiceImpl.java
index 6fee48c5..39632855 100644
--- a/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/CtpAttachmentServiceImpl.java
+++ b/fw-oa/src/main/java/com/hzya/frame/seeyon/service/impl/CtpAttachmentServiceImpl.java
@@ -3,10 +3,12 @@ package com.hzya.frame.seeyon.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.hzya.frame.basedao.service.impl.BaseService;
 import com.hzya.frame.seeyon.dao.ICtpAttachmentDao;
+import com.hzya.frame.seeyon.dao.ICtpFileDao;
 import com.hzya.frame.seeyon.entity.CtpAttachmentEntity;
 import com.hzya.frame.seeyon.entity.CtpFileEntity;
 import com.hzya.frame.seeyon.service.ICtpAttachmentService;
 import com.hzya.frame.seeyon.service.ICtpFileService;
+import com.hzya.frame.sysnew.comparison.controlsLog.dao.impl.ControlsLogDaoImpl;
 import com.hzya.frame.uuid.UUIDLong;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,9 @@ public class CtpAttachmentServiceImpl extends BaseService<CtpAttachmentEntity, S
     private ICtpAttachmentDao ctpAttachmentDao;
     @Autowired
     private ICtpFileService ctpFileService;
+
+    @Autowired
+    private ICtpFileDao ctpFileDao;
     @Autowired
     public void setCtpAttachmentDao(ICtpAttachmentDao dao) {
         this.ctpAttachmentDao = dao;
@@ -46,11 +51,12 @@ public class CtpAttachmentServiceImpl extends BaseService<CtpAttachmentEntity, S
         CtpFileEntity ctpFileEntity = new CtpFileEntity();
         ctpFileEntity.setId(fileUrl);
         ctpFileEntity.setDataSourceCode(dataSourceCode);
-        List<CtpFileEntity> ctpFileList = ctpFileService.query(ctpFileEntity);
+        List<CtpFileEntity> ctpFileList = ctpFileDao.queryFile(ctpFileEntity);
         if (CollectionUtils.isNotEmpty(ctpFileList)){
             CtpFileEntity ctpFile = ctpFileList.get(0);
             if (null != ctpFile){
                 CtpAttachmentEntity ctpAttachmentEntity = new CtpAttachmentEntity();
+                ctpAttachmentEntity.setDataSourceCode(dataSourceCode);
                 ctpAttachmentEntity.setId(String.valueOf(UUIDLong.longUUID()));
                 ctpAttachmentEntity.setFile_url(ctpFile.getId());//ctp_file表的id
                 ctpAttachmentEntity.setAtt_reference(col_summary_id);//业务表单的id
@@ -61,7 +67,7 @@ public class CtpAttachmentServiceImpl extends BaseService<CtpAttachmentEntity, S
                 ctpAttachmentEntity.setMime_type(ctpFile.getMime_type());
                 ctpAttachmentEntity.setAttachment_size(ctpFile.getFile_size());
                 ctpAttachmentEntity.setCreatedate(new Date());
-                this.save(ctpAttachmentEntity);
+                ctpAttachmentDao.saveCtpAttachment(ctpAttachmentEntity);
                 return ctpAttachmentEntity;
             }
         }