Merge remote-tracking branch 'origin/develop_1' into develop_master

2021-07-16 16:05:50 +08:00
parent 22e5bb519c be34548613
commit 299e69b383
5 changed files with 34 additions and 11 deletions
@@ -663,11 +663,25 @@
        select STAND_ID,XCXSSRQ,ZCCSSRQ
        from sar_stand_attr_info
    </select>
-    <select id="selectStandId" resultType="java.lang.String">
-        SELECT STAND_ID
-        FROM sar_stand_attr_info
-        group by STAND_ID limit #{page},#{size}
+    <select resultType="java.lang.String" id="selectStandId">
+        SELECT
+            a.STAND_ID
+        FROM
+            sar_stand_items a
+        LEFT JOIN sar_standards_info b
+        on a.STAND_ID=b.ID
+        WHERE b.VALID_FLAG = 0
+        GROUP BY
+            a.STAND_ID
+            limit #{page},#{size}
+    </select>
+    <select id="selectToken" resultType="java.lang.Integer">
+        SELECT
+            count(DISTINCT a.STAND_ID )
+        FROM
+            sar_stand_items a LEFT JOIN sar_standards_info b
+                                        on a.STAND_ID=b.ID
+        WHERE b.VALID_FLAG = 0
    </select>

-
 </mapper>