活动bug调整

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

@@ -5,8 +5,8 @@
 <mapper namespace="com.xjrsoft.module.activity.mapper.ActivityEnrollMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.activity.dto.ActivityEnrollPageDto" resultType="com.xjrsoft.module.activity.vo.ActivityEnrollPageVo">
         SELECT t1.id,t1.status,t2.name,t1.create_date,t2.user_name,t2.mobile,
-        (select id from base_teacher where user_id = t1.id) as teacher_id,
-        (select id from base_student where user_id = t1.id) as student_id FROM activity_enroll t1
+        (select id from base_teacher where user_id = t1.user_id) as teacher_id,
+        (select id from base_student where user_id = t1.user_id) as student_id FROM activity_enroll t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         WHERE t1.delete_mark = 0 AND t1.activity_info_id = #{dto.activityInfoId}
         <if test="dto.status != null">
@@ -16,8 +16,8 @@
 
     <select id="getList" parameterType="com.xjrsoft.module.activity.dto.ActivityEnrollPageDto" resultType="com.xjrsoft.module.activity.vo.ActivityEnrollPageVo">
         SELECT t1.id,t1.status,t2.name,t1.create_date,t2.user_name,t2.mobile,t1.activity_info_id,
-        (select id from base_teacher where user_id = t1.id) as teacher_id,
-        (select id from base_student where user_id = t1.id) as student_id FROM activity_enroll t1
+        (select id from base_teacher where user_id = t1.user_id) as teacher_id,
+        (select id from base_student where user_id = t1.user_id) as student_id FROM activity_enroll t1
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         WHERE t1.delete_mark = 0 AND t1.activity_info_id = #{dto.activityInfoId}
         <if test="dto.status != null">

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

@@ -6,7 +6,7 @@
     <select id="getPage" parameterType="com.xjrsoft.module.activity.dto.ActivityInfoPageDto" resultType="com.xjrsoft.module.activity.vo.ActivityInfoPageVo">
         SELECT t1.id,t2.name AS type_cn,t3.company_name AS enterprise_name,t1.name,t1.place,t1.start_date,t1.end_date,
         t1.type, t4.name AS org_name, t1.enroll_end_time, t1.duty_person,t1.duty_person_mobile, t1.cover_file_id,
-        t1.enroll_range, t1.status,t1.content,t1.category,
+        t1.enroll_range, t1.status,t1.content,t1.category,t4.name as org_name,t1.org_id,
         (SELECT COUNT(*) FROM activity_enroll WHERE delete_mark = 0 AND activity_info_id = t1.id) as enroll_count FROM activity_info t1
         LEFT JOIN xjr_dictionary_detail t2 ON t1.type = t2.code
         LEFT JOIN company_coop t3 ON t1.enterprise_id = t3.id

src/main/resources/sqlScript/20240718_sql.sql

@@ -189,7 +189,8 @@ CREATE TABLE `party_build_event_participant`
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8mb4
     COMMENT '党建活动参与人员';
-
+    
+-- 2024年7月23日
 -- --------------------------------------------------------------------------------------------
 -- 考试科目成绩表
 -- --------------------------------------------------------------------------------------------