GA38 21标 存在时就不再计算15 标

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

@@ -33,7 +33,7 @@
                                        (standard = 1,
                                         IF(date_of_compliance < #{date} and date_of_compliance >= #{prevMonth}, 1,
                                            0), 0))                                                 AS ga382021prev,
-                                   sum(standard = 2)                                               AS ga382015,
+                                (case WHEN LOCATE("1",group_concat(standard))>0 THEN 0 WHEN LOCATE("2",group_concat(standard))>0 AND LOCATE("2",group_concat(standard))<=0 THEN 1  ELSE  0 END)  AS ga382015,
                                    sum(IF
                                        (standard = 2, IF(date_of_compliance >= #{date}, 1, 0), 0)) AS ga382015current,
                                    sum(IF