活动信息查询调整

src/main/resources/mapper/activity/ActivityInfoMapper.xml

@@ -53,33 +53,33 @@
             and (t1.status = 1 or t1.status = 2) and NOW() between t1.start_date and t1.end_date
         </if>
         UNION
-        SELECT a1.id, a1.club_activities_name AS NAME, 1 AS enroll_status,
-        a1.club_activities_content AS content,
-        a1.activity_location AS place,a1.start_time AS start_date
-        ,a1.end_time AS end_date, NULL AS cover_file_id,3 AS category,NULL AS org_name
-        ,NULL AS enroll_end_time, 1 AS STATUS,NULL AS TYPE,a1.activity_type as type_cn
+        SELECT a1.id, a1.club_activities_name AS NAME,a1.activity_location AS place,a1.start_time AS start_date,a1.end_time AS end_date,
+        NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id,1 AS STATUS,
+        a1.club_activities_content AS content,1 AS enroll_status,
+        3 AS category, a1.activity_type AS type_cn
         FROM club_activities a1 WHERE a1.delete_mark = 0 AND a1.student_id IN
         (SELECT credential_number FROM xjr_user WHERE id = #{dto.loginUserId})
         UNION
-        SELECT a2.id, a2.moral_event_name AS NAME, 1 AS enroll_status,
-        a2.event_content AS content,
-        a2.event_address AS place,a2.event_start_time AS start_date
-        ,a2.event_end_time AS end_date, NULL AS cover_file_id,4 AS category,NULL AS org_name
-        ,NULL AS enroll_end_time, 1 AS STATUS,NULL AS TYPE,a2.event_type as type_cn
+        SELECT a2.id, a2.moral_event_name AS NAME,a2.event_address AS place,
+        a2.event_start_time AS start_date,a2.event_end_time AS end_date,NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,
+        NULL AS cover_file_id,1 AS STATUS,
+        a2.event_content AS content,4 AS category,1 AS enroll_status
+        , a2.event_type AS type_cn
         FROM moral_event a2 WHERE a2.delete_mark = 0 AND
         (a2.attend_teacher = #{dto.loginUserId} OR FIND_IN_SET((
         SELECT class_id FROM base_student_school_roll WHERE user_id = #{dto.loginUserId}
         ),a2.attend_class) > 0
         )
         UNION
-        SELECT a3.id,a3.training_name AS NAME,1 AS enroll_status, a3.training_topic AS content,a3.training_address AS place,
-        a3.start_time AS start_date, a3.end_time AS end_date,NULL AS cover_file_id, 5 AS category, NULL AS org_name,NULL AS enroll_end_time,
-        STATUS, NULL AS TYPE, NULL AS type_cn FROM wf_teacher_training a3
+        SELECT a3.id,a3.training_name AS NAME,a3.training_address AS place,a3.start_time AS start_date, a3.end_time AS end_date,
+        NULL AS TYPE,NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id, STATUS,
+        a3.training_topic AS content,5 AS category,1 AS enroll_status,  NULL AS type_cn FROM wf_teacher_training a3
         INNER JOIN wf_teacher_training_participant a4 ON a3.id = a4.wf_teacher_training_id
         WHERE a3.delete_mark = 0 AND a4.participant_id = #{dto.loginUserId}
         UNION
-        SELECT id,party_tissue_name AS NAME, event_content AS content,event_address AS place,event_start_time AS start_date, event_end_time AS end_date, event_type AS TYPE,
-        1 AS enroll_status,NULL AS cover_file_id, 6 AS category, NULL AS org_name,NULL AS enroll_end_time,1 AS STATUS,NULL AS type_cn FROM party_build_event
+        SELECT id,party_tissue_name AS NAME,event_address AS place,event_start_time AS start_date, event_end_time AS end_date,event_type AS TYPE,
+        NULL AS org_name,NULL AS enroll_end_time,NULL AS cover_file_id,1 AS STATUS, event_content AS content, 6 AS category,
+        1 AS enroll_status, NULL AS type_cn FROM party_build_event
         WHERE delete_mark = 0 AND (
         participant_teacher_name LIKE CONCAT('%',#{dto.loginUserId},'%') OR participant_student_name LIKE CONCAT('%',#{dto.loginUserId},'%')
         )