feat(school-sysUser): BookRecommend

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/book/BasicPlanVO.java

@@ -8,6 +8,9 @@ import lombok.Data;
 @ApiModel(value = "BasicPlanVO", description = "培养层次")
 public class BasicPlanVO {
 
+    @ApiModelProperty("公共表ID")
+    private Integer id;
+
     @ApiModelProperty("培养层次ID")
     private Integer basicPlanId;
 

com.zrqx.core/src/main/java/com/zrqx/core/vo/schoolsysuser/fg/book/MidListVO.java

@@ -11,6 +11,9 @@ import java.util.List;
 @ApiModel(value = "MidListVO", description = "中级审核列表VO")
 public class MidListVO {
 
+    @ApiModelProperty("ID")
+    private Integer id;
+
     @ApiModelProperty("培养层次ID")
     private Integer basicPlanId;
 
@@ -23,6 +26,9 @@ public class MidListVO {
     @Data
     public static class LessonDetailsVo{
 
+        @ApiModelProperty("序号")
+        private Integer serial;
+
         @ApiModelProperty("学级")
         private Integer academicLevel;
 

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/book/BookRecommendMapper.java

@@ -118,8 +118,10 @@ public interface BookRecommendMapper extends BaseMapper<BookRecommend> {
     @Select(" <script> "
             + " SELECT "
             + " b.name, "
+            + " b.id, "
             + " b.basicPlanId "
-            + " FROM me_book_recommend b "
+            + " FROM (select @i:=0) as s, "
+            + " me_book_recommend b "
             //关联用户推荐关系表，过滤非当前用户推荐的记录
             + " LEFT JOIN me_book_user_relation r ON b.id = r.recommendId "
             //关联状态表，查询已提交的推荐列表
@@ -148,11 +150,12 @@ public interface BookRecommendMapper extends BaseMapper<BookRecommend> {
      */
     @Select(" <script> "
             + " SELECT "
-//            + " (@i:=@i+1) as serial, "
+            + " (@i:=@i+1) as serial, "
             + " b.academicLevel, "
             + " b.lessonId, "
             + " b.departmentId "
-            + " FROM me_book_recommend b "
+            + " FROM (select @i:=0) as s, "
+            + " me_book_recommend b "
             //关联用户推荐关系表，过滤非当前用户推荐的记录
             + " LEFT JOIN me_book_user_relation r ON b.id = r.recommendId "
             //关联状态表，查询已提交的推荐列表