活动报错解决

src/main/java/com/xjrsoft/module/activity/controller/ActivityEnrollController.java

@@ -65,6 +65,11 @@ public class ActivityEnrollController {
         Page<ActivityEnrollPageVo> page = activityEnrollService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<ActivityEnrollPageVo> pageOutput = ConventPage.getPageOutput(page, ActivityEnrollPageVo.class);
         for (ActivityEnrollPageVo item : pageOutput.getList()) {
+            if(item.getStudentId() != null){
+                item.setRoleId(3L);
+            }else if(item.getTeacherId() != null){
+                item.setRoleId(2L);
+            }
         }
         return RT.ok(pageOutput);
     }

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -137,10 +137,10 @@ public class ActivityInfoController {
         List<ActivityEnrollPageVo> enrollList = enrollService.getList(dto);
         infoVo.setEnrollCount(enrollList.size());
 
-        Set<ActivityEnrollPageVo> teacherSet = enrollList.stream().filter(x -> x.getRoleId() == 2L).collect(Collectors.toSet());
+        Set<ActivityEnrollPageVo> teacherSet = enrollList.stream().filter(x -> x.getTeacherId() != null).collect(Collectors.toSet());
         infoVo.setTeacherCount(teacherSet.size());
 
-        Set<ActivityEnrollPageVo> studentSet = enrollList.stream().filter(x -> x.getRoleId() == 3L).collect(Collectors.toSet());
+        Set<ActivityEnrollPageVo> studentSet = enrollList.stream().filter(x -> x.getStudentId() != null).collect(Collectors.toSet());
         infoVo.setStudentCount(studentSet.size());
 
         Set<ActivityEnrollPageVo> suretSet = enrollList.stream().filter(x -> (x.getStatus() == 1 || x.getStatus() == 2)).collect(Collectors.toSet());

src/main/java/com/xjrsoft/module/activity/vo/ActivityEnrollPageVo.java

@@ -53,4 +53,11 @@ public class ActivityEnrollPageVo {
 
     @ApiModelProperty("活动id")
     private String activityInfoId;
+
+    @ApiModelProperty("教师表id")
+    private Long teacherId;
+
+    @ApiModelProperty("学生表id")
+    private Long studentId;
+
 }

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

@@ -4,9 +4,10 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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,t3.role_id FROM activity_enroll t1
+        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
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
-        LEFT JOIN xjr_user_role_relation t3 ON t3.user_id = t2.id
         WHERE t1.delete_mark = 0 AND t1.activity_info_id = #{dto.activityInfoId}
         <if test="dto.status != null">
             and t1.status = #{dto.status}
@@ -14,9 +15,10 @@
     </select>
 
     <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,t3.role_id,t1.activity_info_id FROM activity_enroll t1
+        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
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
-        LEFT JOIN xjr_user_role_relation t3 ON t3.user_id = t2.id
         WHERE t1.delete_mark = 0 AND t1.activity_info_id = #{dto.activityInfoId}
         <if test="dto.status != null">
             and t1.status = #{dto.status}

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

@@ -22,7 +22,7 @@
     <select id="getMyPage" 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,t5.status as enroll_status
+        t1.enroll_range, t1.status,t1.content,t1.category,t5.status as enroll_status,
         (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