Merge remote-tracking branch 'remotes/origin/V0.0.6' into V0.0.6-iot

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -273,7 +273,7 @@
                            (q.src_type = 2 AND q.reform_status = 11, 1, 0))                 safetyCheckReformCount,
                sum(
                        IF
-                           (q.confirm_status >= 2 AND q.src_type = 2, 1, 0))             AS safetyCheckConfirmedCount,
+                           (q.confirm_status >= 2 AND q.reform_status IS NOT NULL AND q.src_type = 2, 1, 0))             AS safetyCheckConfirmedCount,
                sum(if(q.reform_status = 10 and q.reform_deadline <= #{today}, 1, 0)) as overdueCount
         FROM core_question q
         WHERE ((