Merge branch 'dev'

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/MajorCategoryController.java

@@ -30,7 +30,7 @@ import java.util.List;
 @Api(value = "【专业分类】控制器", tags = {"专业分类"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/course/category")
+@RequestMapping("/app/common/course/category")
 public class MajorCategoryController extends BaseController {
 
     private final IMajorCategoryService iMajorCategoryService;

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -323,6 +323,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             }
             List<RanKingUser> ranKingUsers = baseMapper.selectByRanks(query);
             if (ranKingUsers != null && ranKingUsers.size() != 0) {
+                for (int i = 0; i < ranKingUsers.size(); i++) {
+                    ranKingUsers.get(i).setRank(i+1);
+                }
                 ranKingUser.setRanKingUsers(ranKingUsers);
             } else {
                 ranKingUser.setRanKingUsers(new ArrayList<>());
@@ -344,6 +347,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             }
             List<RanKingUser> ranKingUsers = baseMapper.selectByRanks(query);
             if (ranKingUsers != null && ranKingUsers.size() != 0) {
+                for (int i = 0; i < ranKingUsers.size(); i++) {
+                    ranKingUsers.get(i).setRank(i+1);
+                }
                 ranKingUser.setRanKingUsers(ranKingUsers);
             } else {
                 ranKingUser.setRanKingUsers(new ArrayList<>());

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -42,7 +42,7 @@ public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfigur
      * @param bo 详细配置信息
      * @return Collection<CourseConfigurationVo> 详细配置
      */
-    Collection<ActivityConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
+    List<ActivityConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
 
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -167,7 +167,7 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     @Override
     public List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo) {
         bo.setStartTime(DateUtils.getNowTime());
-        List<ActivityConfigurationVo> courseConfigurationVos = entityCourseVo(baseMapper.selectConfiguraIssueList(bo));
+        List<ActivityConfigurationVo> courseConfigurationVos = baseMapper.selectConfiguraIssueList(bo);
         return courseConfigurationVos;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -107,9 +107,9 @@ public class ActivityConfigurationVo {
 
 
 	/** 绑定课程 */
-	/*@Excel(name = "绑定课程")
+	@Excel(name = "绑定课程")
 	@ApiModelProperty("绑定课程")
-	private List<CourseVo> courses;*/
+	private List<CourseVo> courseList;
 
 
 	@Excel(name = "绑定课程")

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -72,9 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="supdate_time"/>
         <result property="status" column="sstatus"/>
         <result property="couponEnd" column="scoupon_end"/>
-        <association property="courses" javaType="java.util.List" resultMap="courses" />
-
-
+        <association property="courseList" javaType="java.util.List" resultMap="courses" />
     </resultMap>
 
     <resultMap id="courses" type="com.zhongzheng.modules.course.vo.CourseVo">

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

@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectByRanks" parameterType="com.zhongzheng.modules.user.bo.RanKingUserQuery" resultMap="RanKingUserResult">
-        SELECT A.*,@rank:=@rank+1 as pm
+        SELECT A.*
         FROM
             (
             SELECT sum(s.study_duration) AS sum_study,u.nickname,u.avatar  FROM `user` u
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND s.create_time BETWEEN #{startTime} and #{endTime}
         </if>
             GROUP BY u.user_id ORDER BY sum_study desc LIMIT 20
-            ) A ,(SELECT @rank:=0) B
+            ) A
     </select>
 
     <select id="selectByRankOne" parameterType="integer" resultType="int">