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 0ed7033f..8fb161da 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
@@ -30,5 +30,7 @@ public interface IIncomeInvoiceDao extends IBaseDao<IncomeInvoiceEntity, String>
     int saveMx(IncomeInvoiceEntity incomeInvoiceEntity);
 
     List<IncomeInvoiceEntity> queryZtzz(IncomeInvoiceEntity entity);
+
+    List<JSONObject> queryByAloneId(IncomeInvoiceEntity jnquerydata);
 }
 
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 d5a438f6..8582aab4 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
@@ -60,6 +60,11 @@ public class IncomeInvoiceDaoImpl extends MybatisGenericDao<IncomeInvoiceEntity,
         return o;
     }
 
-
+    @DS("#entity.dataSourceCode")
+    @Override
+    public List<JSONObject> queryByAloneId(IncomeInvoiceEntity entity) {
+        List<JSONObject> o = (List<JSONObject>) super.selectList(getSqlIdPrifx() + "queryByAloneId", entity);
+        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 d923d284..4fc5953d 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
@@ -224,16 +224,315 @@
 
 
     <select id="queryZtzz" resultType="com.hzya.frame.plugin.incomeInvoiceData.entity.IncomeInvoiceEntity"  parameterType="com.hzya.frame.plugin.incomeInvoiceData.entity.IncomeInvoiceEntity">
-        select
-        alone_id as aloneId,
-        keyword2 as sysData,
-        orgs.code as orgCode,
-        orgs.name as orgName,
-        iufo.ver as iufoVer
-        from IUFO_MEASPUB_VIOU iufo
-        LEFT JOIN org_orgs orgs on iufo.keyword1 = orgs.pk_org
-        <if test="sysData != null and sysData !='' "> where iufo.keyword2 = #{sysData} </if>
-        and ver = '0'
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        iufo.alone_id AS aloneId,
+        iufo.keyword2 AS sysData,
+        orgs.code AS orgCode,
+        orgs.name AS orgName,
+        iufo.ver AS iufoVer
+        FROM
+        IUFO_MEASPUB_VIOU iufo
+        LEFT JOIN org_orgs orgs ON iufo.keyword1 = orgs.pk_org
+
+        <trim prefix="where" prefixOverrides="and">
+            <if test="orgCode != null and orgCode !='' "> and orgs.code = #{orgCode} </if>
+            and ver = '0'
+            <if test="sysData != null and sysData !='' "> and iufo.keyword2 LIKE  CONCAT(#{sysData}, '%')   </if>
+        </trim>
+        ORDER BY
+        iufo.keyword2 DESC
+        )
+        WHERE
+        ROWNUM = 1
+
+    </select>
+
+
+    <select id="queryByAloneId" resultType="com.alibaba.fastjson.JSONObject"  parameterType="com.hzya.frame.plugin.incomeInvoiceData.entity.IncomeInvoiceEntity">
+
+        SELECT
+        a.ALONE_ID as ALONE_ID,
+        a.M10004 as aM10004,
+        a.M10005 as aM10005,
+        a.M10010 as aM10010,
+        a.M10012 as aM10012,
+        a.M10014 as aM10014,
+        a.M10019 as aM10019,
+        a.M10020 as aM10020,
+        a.M10021 as aM10021,
+        a.M10022 as aM10022,
+        a.M10025 as aM10025,
+        a.M10110 as aM10110,
+        a.M10027 as aM10027,
+        a.M10112 as aM10112,
+        a.M10029 as aM10029,
+        a.M10032 as aM10032,
+        a.M10033 as aM10033,
+        a.M10034 as aM10034,
+        a.M10035 as aM10035,
+        a.M10040 as aM10040,
+        a.M10128 as aM10128,
+        a.M10042 as aM10042,
+        a.M10130 as aM10130,
+        a.M10044 as aM10044,
+        a.M10045 as aM10045,
+        a.M10046 as aM10046,
+        a.M10047 as aM10047,
+        a.M10048 as aM10048,
+        a.M10049 as aM10049,
+        a.M10050 as aM10050,
+        a.M10051 as aM10051,
+        a.M10052 as aM10052,
+        a.M10053 as aM10053,
+        a.M10054 as aM10054,
+        a.M10055 as aM10055,
+        a.M10057 as aM10057,
+        a.M10059 as aM10059,
+        a.M10060 as aM10060,
+        a.M10061 as aM10061,
+        a.M10062 as aM10062,
+        a.M10063 as aM10063,
+        a.M10064 as aM10064,
+        a.M10065 as aM10065,
+        a.M10066 as aM10066,
+        a.M10073 as aM10073,
+        a.M10146 as aM10146,
+        a.M10075 as aM10075,
+        a.M10148 as aM10148,
+        a.M10077 as aM10077,
+        a.M10078 as aM10078,
+        a.M10079 as aM10079,
+        a.M10080 as aM10080,
+        a.M10081 as aM10081,
+        a.M10082 as aM10082,
+        a.M10083 as aM10083,
+        a.M10084 as aM10084,
+        a.M10087 as aM10087,
+        a.M10088 as aM10088,
+        a.M10091 as aM10091,
+        a.M10164 as aM10164,
+        a.M10093 as aM10093,
+        a.M10166 as aM10166,
+        a.M10095 as aM10095,
+        a.M10096 as aM10096,
+        a.M10097 as aM10097,
+        a.M10098 as aM10098,
+        a.M10099 as aM10099,
+        a.M10100 as aM10100,
+        a.M10101 as aM10101,
+        a.M10102 as aM10102,
+        a.M10105 as aM10105,
+        a.M10106 as aM10106,
+        a.M10109 as aM10109,
+        a.M10182 as aM10182,
+        a.M10111 as aM10111,
+        a.M10184 as aM10184,
+        a.M10113 as aM10113,
+        a.M10114 as aM10114,
+        a.M10115 as aM10115,
+        a.M10116 as aM10116,
+        a.M10117 as aM10117,
+        a.M10118 as aM10118,
+        a.M10119 as aM10119,
+        a.M10120 as aM10120,
+        a.M10123 as aM10123,
+        a.M10124 as aM10124,
+        a.M10127 as aM10127,
+        a.M10200 as aM10200,
+        a.M10129 as aM10129,
+        a.M10202 as aM10202,
+        a.M10131 as aM10131,
+        a.M10132 as aM10132,
+        a.M10133 as aM10133,
+        a.M10134 as aM10134,
+        a.M10135 as aM10135,
+        a.M10138 as aM10138,
+        a.M10141 as aM10141,
+        a.M10142 as aM10142,
+        a.M10143 as aM10143,
+        a.M10144 as aM10144,
+        a.M10145 as aM10145,
+        a.M10147 as aM10147,
+        a.M10149 as aM10149,
+        a.M10150 as aM10150,
+        a.M10151 as aM10151,
+        a.M10152 as aM10152,
+        a.M10153 as aM10153,
+        a.M10154 as aM10154,
+        a.M10155 as aM10155,
+        a.M10156 as aM10156,
+        a.M10257 as aM10257,
+        a.M10259 as aM10259,
+        a.M10159 as aM10159,
+        a.M10160 as aM10160,
+        a.M10161 as aM10161,
+        a.M10162 as aM10162,
+        a.M10163 as aM10163,
+        a.M10165 as aM10165,
+        a.M10167 as aM10167,
+        a.M10168 as aM10168,
+        a.M10169 as aM10169,
+        a.M10170 as aM10170,
+        a.M10171 as aM10171,
+        a.M10172 as aM10172,
+        a.M10173 as aM10173,
+        a.M10174 as aM10174,
+        a.M10281 as aM10281,
+        a.M10283 as aM10283,
+        a.M10179 as aM10179,
+        a.M10180 as aM10180,
+        a.M10181 as aM10181,
+        a.M10222 as aM10222,
+        a.M10183 as aM10183,
+        a.M10224 as aM10224,
+        a.M10185 as aM10185,
+        a.M10186 as aM10186,
+        a.M10187 as aM10187,
+        a.M10188 as aM10188,
+        a.M10189 as aM10189,
+        a.M10190 as aM10190,
+        a.M10191 as aM10191,
+        a.M10192 as aM10192,
+        a.M10295 as aM10295,
+        a.M10193 as aM10193,
+        a.M10297 as aM10297,
+        a.M10194 as aM10194,
+        a.M10195 as aM10195,
+        a.M10196 as aM10196,
+        a.M10197 as aM10197,
+        a.M10198 as aM10198,
+        a.M10199 as aM10199,
+        a.M10201 as aM10201,
+        a.M10203 as aM10203,
+        a.M10208 as aM10208,
+        a.M10209 as aM10209,
+        a.M10212 as aM10212,
+        a.M10310 as aM10310,
+        a.M10214 as aM10214,
+        a.M10312 as aM10312,
+        a.M10216 as aM10216,
+        a.M10217 as aM10217,
+        a.M10218 as aM10218,
+        a.M10219 as aM10219,
+        a.M10220 as aM10220,
+        a.M10221 as aM10221,
+        a.M10223 as aM10223,
+        a.M10225 as aM10225,
+        a.M10226 as aM10226,
+        a.M10227 as aM10227,
+        a.M10230 as aM10230,
+        a.M10231 as aM10231,
+        a.M10234 as aM10234,
+        a.M10325 as aM10325,
+        a.M10236 as aM10236,
+        a.M10327 as aM10327,
+        a.M10238 as aM10238,
+        a.M10239 as aM10239,
+        a.M10240 as aM10240,
+        a.M10241 as aM10241,
+        a.M10242 as aM10242,
+        a.M10243 as aM10243,
+        a.M10244 as aM10244,
+        a.M10245 as aM10245,
+        a.M10246 as aM10246,
+        a.M10247 as aM10247,
+        a.M10248 as aM10248,
+        a.M10249 as aM10249,
+        a.M10250 as aM10250,
+        a.M10251 as aM10251,
+        a.M10252 as aM10252,
+        a.M10253 as aM10253,
+        a.M10256 as aM10256,
+        a.M10340 as aM10340,
+        a.M10258 as aM10258,
+        a.M10342 as aM10342,
+        a.M10260 as aM10260,
+        a.M10265 as aM10265,
+        a.M10266 as aM10266,
+        a.M10267 as aM10267,
+        a.M10268 as aM10268,
+        a.M10269 as aM10269,
+        a.M10276 as aM10276,
+        a.M10277 as aM10277,
+        a.M10280 as aM10280,
+        a.M10282 as aM10282,
+        a.M10284 as aM10284,
+        a.M10287 as aM10287,
+        a.M10288 as aM10288,
+        a.M10289 as aM10289,
+        a.M10290 as aM10290,
+        a.M10291 as aM10291,
+        a.M10292 as aM10292,
+        a.M10293 as aM10293,
+        a.M10294 as aM10294,
+        a.M10011 as aM10011,
+        a.M10296 as aM10296,
+        a.M10013 as aM10013,
+        a.M10298 as aM10298,
+        a.M10299 as aM10299,
+        a.M10300 as aM10300,
+        a.M10301 as aM10301,
+        a.M10304 as aM10304,
+        a.M10305 as aM10305,
+        a.M10306 as aM10306,
+        a.M10307 as aM10307,
+        a.M10308 as aM10308,
+        a.M10309 as aM10309,
+        a.M10026 as aM10026,
+        a.M10311 as aM10311,
+        a.M10028 as aM10028,
+        a.M10313 as aM10313,
+        a.M10314 as aM10314,
+        a.M10315 as aM10315,
+        a.M10316 as aM10316,
+        a.M10319 as aM10319,
+        a.M10320 as aM10320,
+        a.M10321 as aM10321,
+        a.M10323 as aM10323,
+        a.M10326 as aM10326,
+        a.M10041 as aM10041,
+        a.M10328 as aM10328,
+        a.M10043 as aM10043,
+        a.M10329 as aM10329,
+        a.M10334 as aM10334,
+        a.M10335 as aM10335,
+        a.M10336 as aM10336,
+        a.M10338 as aM10338,
+        a.M10337 as aM10337,
+        a.M10339 as aM10339,
+        a.M10341 as aM10341,
+        a.M10056 as aM10056,
+        a.M10343 as aM10343,
+        a.M10058 as aM10058,
+        a.M10344 as aM10344,
+        a.M10347 as aM10347,
+        a.M10348 as aM10348,
+        a.M10349 as aM10349,
+        a.M10350 as aM10350,
+        a.M10351 as aM10351,
+        a.M10352 as aM10352,
+        a.M10353 as aM10353,
+        a.M10354 as aM10354,
+        b.MPQW10U as bMPQW10U,
+        b.MP81A2Z as bMP81A2Z,
+        b.MS13DPL as bMS13DPL,
+        b.M6TFKPL as bM6TFKPL,
+        c.M10002 as cM10002,
+        c.M10000 as cM10000,
+        c.M10004 as cM10004,
+        c.M10003 as cM10003,
+        c.M10001 as cM10001
+        FROM
+        iufo_measure_data_qi0xy5nl a
+        LEFT JOIN iufo_measure_data_v40w9co7 b on a.ALONE_ID = b.ALONE_ID
+        LEFT JOIN iufo_measure_data_jz8zffdp c on a.ALONE_ID = c.ALONE_ID
+        <trim prefix="where" prefixOverrides="and">
+            <if test="aloneId != null and aloneId != ''"> and a.ALONE_ID = #{aloneId} </if>
+        </trim>
     </select>
 </mapper>
 
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 ac801897..29eef34c 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
@@ -690,6 +690,14 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         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");
@@ -711,24 +719,51 @@ public class IncomeInvoiceServiceImpl extends BaseService<IncomeInvoiceEntity, S
         }
 
         //查询帐套组织
-        IncomeInvoiceEntity entity = new IncomeInvoiceEntity();
-        entity.setDataSourceCode("");
-        entity.setSysData(jnDate);
-        entity.setOrgCode("jnDate");
-        List<IncomeInvoiceEntity> list = incomeInvoiceDao.queryZtzz(entity);
-        if(list != null && list.size() > 0){
-            for (int i = 0; i < list.size(); i++) {
-                //查询数据
-
-
-
-
-
-
-
-
-            }
+        IncomeInvoiceEntity jnentity = new IncomeInvoiceEntity();
+        jnentity.setDataSourceCode("");
+        jnentity.setSysData(jnDate);
+        jnentity.setOrgCode(orgCode);
+        List<IncomeInvoiceEntity> 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<IncomeInvoiceEntity> 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<JSONObject> 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<JSONObject> qndataList = incomeInvoiceDao.queryByAloneId(qnquerydata);
+        if(qndataList != null && qndataList.size() == 1){
+            qndata = qndataList.get(0);
+        }
+        //拼接数据
+
+
+
 
         return BaseResult.getSuccessMessageEntity("执行成功");
     }