kevin_zhangl 3 лет назад
Родитель
Сommit
d633477a7a
1 измененных файлов с 9 добавлено и 8 удалено
  1. 9 8
      sql/upgrade/1988.sql

+ 9 - 8
sql/upgrade/1988.sql

@@ -109,16 +109,17 @@ BEGIN
     ) AO ON AO.USER_ID = AU.ID
     LEFT JOIN (
         SELECT
-            REC_USER_ID,
-            COUNT(ID) AS ACHIEVE_MEMBER_NUM,
-            GROUP_CONCAT(ID) AS ACHIEVE_MEMBER
+            R.PARENT_UID,
+            COUNT(O.USER_ID) AS ACHIEVE_MEMBER_NUM,
+            GROUP_CONCAT(CONCAT(O.USER_ID, '_', U.USER_NAME, '_', O.PERIOD_NUM) separator ' | ') AS ACHIEVE_MEMBER
         FROM
-            AR_DEC_ORDER
+            AR_PERF_ORDER O
+                INNER JOIN AR_USER_RELATION_NEW R ON O.USER_ID = R.USER_ID
+                INNER JOIN AR_USER U ON O.USER_ID = U.ID
         WHERE
-            IS_DEL = 0 AND PERIOD_NUM IN ( SELECT PERIOD_NUM FROM AR_PERIOD WHERE PCALCYEAR AND CALC_MONTH = PCALCMONTH )
-        GROUP BY
-            REC_USER_ID
-    ) DO ON DO.REC_USER_ID = AU.ID
+                O.CALC_MONTH = PCALCMONTH AND O.DEC_TYPE = 'ZC'
+        GROUP BY R.PARENT_UID
+    ) DO ON DO.PARENT_UID = AU.ID
     WHERE
             AU.DELETED = 0;