活动

src/main/resources/mapper/Activity.xml

@@ -72,6 +72,35 @@
         WHERE
             t.org_id = #{orgId}
             AND t.person_id = #{personId}
+      UNION ALL
+        SELECT
+            t.record_id AS id,
+            t.group_activity_id AS activityId,
+            t.create_time AS createDate,
+        CASE
+            WHEN t.STATUS = 1 THEN
+            "进行中"
+            WHEN t.STATUS = 0
+            AND t.verification_status = 1 THEN
+            "成功已核销"
+        WHEN t.STATUS = 0
+        AND t.verification_status != 1 THEN
+        "成功未核销"
+        WHEN t.STATUS = 2 THEN
+        "失败"
+        END `joinStatus`,
+            d.list_img AS mainImg,
+            d.activity_name AS title,
+            d.status,
+            d.start_time AS startDate,
+            d.end_time AS endDate,
+            'group' AS type
+        FROM
+            ta_share_child_record t
+            LEFT JOIN ta_share_activity d ON t.group_activity_id = d.group_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
       UNION ALL
         SELECT
             t.help_record_initiate_id AS id,