*）修改sql

amos-boot-system-cas/amos-boot-module-cas-api/src/main/resources/mapper/IdxBizXnzsMapper.xml

@@ -132,18 +132,18 @@
     <select id="select" resultType="com.yeejoin.amos.boot.module.cas.api.dto.IdxBizXnzsDto">
         SELECT
         a.c_ds as axisData,
-        a.one,
-        b.two,
-        c.three,
-        d.four
+        a.four,
+        b.one,
+        c.two,
+        d.three
         FROM
         (
         SELECT
         c_ds,
-        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "one"
+        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "four"
         FROM
         idx_biz_xnzs AS b,
-        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 0, 1 ) AS a
+        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 3, 1 ) AS a
         WHERE
         a.c_nf = b.c_nf
         AND a.c_jddm = b.c_jddm
@@ -154,10 +154,10 @@
         LEFT JOIN (
         SELECT
         c_ds,
-        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "two"
+        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "one"
         FROM
         idx_biz_xnzs AS b,
-        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 1, 1 ) AS a
+        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 0, 1 ) AS a
         WHERE
         a.c_nf = b.c_nf
         AND a.c_jddm = b.c_jddm
@@ -168,10 +168,10 @@
         LEFT JOIN (
         SELECT
         c_ds,
-        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "three"
+        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "two"
         FROM
         idx_biz_xnzs AS b,
-        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 2, 1 ) AS a
+        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 1, 1 ) AS a
         WHERE
         a.c_nf = b.c_nf
         AND a.c_jddm = b.c_jddm
@@ -182,10 +182,10 @@
         LEFT JOIN (
         SELECT
         c_ds,
-        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "four"
+        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "three"
         FROM
         idx_biz_xnzs AS b,
-        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 3, 1 ) AS a
+        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 2, 1 ) AS a
         WHERE
         a.c_nf = b.c_nf
         AND a.c_jddm = b.c_jddm
@@ -195,23 +195,21 @@
         ) AS d ON d.c_ds = a.c_ds
     </select>
 
-
-
     <select id="selectZwdl" resultType="com.yeejoin.amos.boot.module.cas.api.dto.IdxBizXnzsDto">
         SELECT
         a.c_zwdl as axisData,
-        a.one,
-        b.two,
-        c.three,
-        d.four
+        a.four,
+        COALESCE(b.one, 0) AS one,
+        COALESCE(c.two, 0) AS two,
+        COALESCE(d.three, 0) AS three
         FROM
         (
         SELECT
         c_zwdl,
-        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz) * b.c_bbqz )), 2 ) AS "one"
+        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz)), 2 ) AS "four"
         FROM
         idx_biz_xnzs AS b,
-        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 0, 1 ) AS a
+        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 3, 1 ) AS a
         WHERE
         a.c_nf = b.c_nf
         AND a.c_jddm = b.c_jddm
@@ -222,10 +220,10 @@
         LEFT JOIN (
         SELECT
         c_zwdl,
-        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "two"
+        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz) * b.c_bbqz )), 2 ) AS "one"
         FROM
         idx_biz_xnzs AS b,
-        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 1, 1 ) AS a
+        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 0, 1 ) AS a
         WHERE
         a.c_nf = b.c_nf
         AND a.c_jddm = b.c_jddm
@@ -236,10 +234,10 @@
         LEFT JOIN (
         SELECT
         c_zwdl,
-        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "three"
+        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "two"
         FROM
         idx_biz_xnzs AS b,
-        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 2, 1 ) AS a
+        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 1, 1 ) AS a
         WHERE
         a.c_nf = b.c_nf
         AND a.c_jddm = b.c_jddm
@@ -250,10 +248,10 @@
         LEFT JOIN (
         SELECT
         c_zwdl,
-        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz)), 2 ) AS "four"
+        round( SUM(((( b.c_xnzs * b.c_jdqz ) * b.c_dsqz ) * b.c_bbqz )), 2 ) AS "three"
         FROM
         idx_biz_xnzs AS b,
-        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 3, 1 ) AS a
+        ( SELECT c_jd, c_nf, c_jddm FROM idx_biz_xnzs GROUP BY c_jd, c_nf ORDER BY c_nf DESC, c_jddm DESC LIMIT 2, 1 ) AS a
         WHERE
         a.c_nf = b.c_nf
         AND a.c_jddm = b.c_jddm