yangdamao 1 年之前
父节点
当前提交
b5ac9efd71

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -24,6 +24,8 @@ import java.util.List;
 public class ClassGradeVo {
 	private static final long serialVersionUID = 1L;
 
+	private Long id;
+
 	/** $pkColumn.columnComment */
 	@ApiModelProperty("$pkColumn.columnComment")
 	private Long gradeId;

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -228,6 +228,7 @@
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
+        <result property="id" column="id"/>
         <result property="gradeId" column="grade_id"/>
         <result property="classStatus" column="class_status"/>
         <result property="officialName" column="official_name"/>
@@ -868,6 +869,7 @@
         cgu.period_plush,
         cgu.order_goods_id,
         cg.official_name,
+        cgu.id,
         cgu.period_wait_time
         FROM
         class_grade_user cgu

+ 0 - 2
zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -710,10 +710,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND og.`status` = 1
           AND o.user_id = #{userId}
           AND INSTR( CONCAT( cet.education_name, cb.business_name, cpt.project_name ), #{businessName} )
-          AND INSTR( m.category_name, #{majorName} )
         ORDER BY
             og.create_time DESC
-            LIMIT 1
     </select>
 
     <select id="getUserOrderCount" parameterType="map" resultType="java.lang.Long">