fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserMockSubscribeVo.java

@@ -130,6 +130,16 @@ public class UserMockSubscribeVo {
 	@ApiModelProperty("专业名字")
 	private String categoryName;
 
+	/** 项目id */
+	@Excel(name = "项目id")
+	@ApiModelProperty("项目id")
+	private Long projectId;
+
+	/** 项目名字 */
+	@Excel(name = "项目名字")
+	@ApiModelProperty("项目名字")
+	private String projectName;
+
 	/** 科目id */
 	@Excel(name = "科目id")
 	@ApiModelProperty("科目id")

zhongzheng-system/src/main/resources/mapper/modules/user/UserMockSubscribeMapper.xml

@@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessName" column="business_name"/>
         <result property="majorId" column="major_id"/>
         <result property="categoryName" column="category_name"/>
+        <result property="projectId" column="project_id"/>
+        <result property="projectName" column="project_name"/>
         <result property="subjectId" column="subject_id"/>
         <result property="subjectName" column="subject_name"/>
         <result property="timeLimit" column="time_limit"/>
@@ -136,7 +138,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 cs.subject_name,
                 ma.apply_name,
                 mm.major_id,
-                m.category_name
+                m.category_name,
+                ma.business_id,
+                cb.business_name,
+                ma.project_id,
+                cpt.project_name
         FROM user_mock_subscribe ums
         LEFT JOIN `user` u ON ums.user_id = u.user_id
         LEFT JOIN mock_major_subject mms ON ums.mock_major_subject_id = mms.mock_major_subject_id
@@ -145,6 +151,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN exam e ON mms.exam_id = e.exam_id
         LEFT JOIN course_subject cs ON mms.subject_id = cs.id
         LEFT JOIN mock_apply ma ON ums.apply_id = ma.apply_id
+        LEFT JOIN course_business cb ON ma.business_id = cb.id
+        LEFT JOIN course_project_type cpt ON ma.project_id = cpt.id
         WHERE
         1=1
         <if test="businessId != null and businessId != ''">