修改财务信息获取

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -5,20 +5,19 @@
         select
             ck.id kqId,
             cd.id deptId,
-            cx.id  cwId,
+            t2.cwId,
             SUBSTRING_INDEX(cd.SHENG, ',', 1) SHENG,
             SUBSTRING_INDEX(SUBSTRING_INDEX(cd.SHENG, ',', 2), ',', -1) SHI,
             SUBSTRING_INDEX(cd.SHENG, ',', -1) XIAN,
             cd.DWMC,
             ck.KQMC,
             ifnull(t1.yxcfnum, 0) yxcfnum,
-            ifnull(cx.SYNDZZC, 0) syndzzc,
+            ifnull(t2.SYNDZZC, 0) syndzzc,
             ifnull(t2.JLR, 0) jlr,
             ck.KQFZR kqfzr,
             ck.LXDH lxdh
         from  DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
-        left join DELIVERY_CWXX  cx  on  cx.DEPT_ID=cd.id
         inner join
         (
                 select
@@ -33,6 +32,8 @@
         (
                 select
                         cx.KQID,
+                        cx.id cwId,
+                        cx.SYNDZZC,
                         cy.JLR
                 from   DELIVERY_CWXX  cx
                 JOIN
@@ -73,14 +74,14 @@
         select
             ck.id kqId,
             cd.id deptId,
-            cx.id  cwId,
+            t2.cwId,
             SUBSTRING_INDEX(cd.SHENG, ',', 1) SHENG,
             SUBSTRING_INDEX(SUBSTRING_INDEX(cd.SHENG, ',', 2), ',', -1) SHI,
             SUBSTRING_INDEX(cd.SHENG, ',', -1) XIAN,
             cd.DWMC,
             ck.KQMC,
             ifnull(t1.yxcfnum, 0) yxcfnum,
-            ifnull(cx.SYNDZZC, 0) syndzzc,
+            ifnull(t2.SYNDZZC, 0) syndzzc,
             ifnull(t2.JLR, 0) jlr,
             ck.KQFZR kqfzr,
             ck.LXDH lxdh,
@@ -90,7 +91,6 @@
         from  DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
         join DELIVERY_PROVINCE  pe on pe.KQ_ID=ck.id
-        left join DELIVERY_CWXX  cx  on  cx.DEPT_ID=cd.id
         join
         (
                 select
@@ -105,6 +105,8 @@
         (
                 select
                         cx.KQID,
+                        cx.id cwId,
+                        cx.SYNDZZC,
                         cy.JLR
                 from   DELIVERY_CWXX  cx
                 JOIN

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -170,7 +170,7 @@
         select
             ck.id kqId,
             cd.id deptId,
-            cx.id  cwId,
+            t2.cwId,
             SUBSTRING_INDEX(cd.SHENG, ',', 1) SHENG,
             SUBSTRING_INDEX(SUBSTRING_INDEX(cd.SHENG, ',', 2), ',', -1) SHI,
             SUBSTRING_INDEX(cd.SHENG, ',', -1) XIAN,
@@ -180,14 +180,13 @@
             t1.sjcrNum,
             t1.cfnum cfnum,
             ifnull(t3.yxcfnum, 0) yxcfnum,
-            ifnull(cx.SYNDZZC, 0) zzc,
+            ifnull(t2.SYNDZZC, 0) zzc,
             ifnull(t2.JLR, 0) sndjlr,
             ck.KQFZR kqfzr,
             ck.LXDH lxdh
         from  DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
         join DELIVERY_PROVINCE  pe  on ck.id=pe.KQ_ID
-        left join DELIVERY_CWXX  cx  on  cx.KQID=ck.id
         join
         (
                 select
@@ -220,20 +219,22 @@
         left join
         (
                 select
-                        cx.DEPT_ID,
+                        cx.KQID,
+                        cx.id cwId,
+                        cx.SYNDZZC,
                         cy.JLR
                 from   DELIVERY_CWXX  cx
                 JOIN
                   (
                    SELECT d.CWXX_ID,d.JLR
                    FROM DELIVERY_CWXX_YEAR d
-                   INNER JOIN (
+                   JOIN (
                    SELECT CWXX_ID, MAX(CN) AS maxCN
                    FROM  DELIVERY_CWXX_YEAR
                    GROUP BY  CWXX_ID) m
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
-        ) t2 on t2.DEPT_ID=cd.id
+        ) t2 on t2.KQID=ck.id
         left join
         (
         select