计划生成修改

zhongzheng-api/src/main/java/com/zhongzheng/controller/activity/PlanController.java

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.activity.bo.ActivityTaskUserAddBo;
 import com.zhongzheng.modules.activity.service.IActivityTaskService;
 import com.zhongzheng.modules.activity.vo.ActivityTaskVo;
 import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
+import com.zhongzheng.modules.user.domain.UserPlan;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.service.IUserPlanService;
 import com.zhongzheng.modules.user.vo.UserPlanVo;
@@ -56,7 +57,7 @@ public class PlanController extends BaseController {
      */
     @ApiOperation("获得用户学习计划")
     @GetMapping("/userPlan")
-    public AjaxResult<UserPlanVo> userPlan(UserPlanQueryBo bo) throws ParseException {
+    public AjaxResult<List<UserPlanVo>> userPlan(UserPlanQueryBo bo) throws ParseException {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(userPlanService.userPlan(bo));

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

@@ -175,6 +175,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         int month = cal.get(Calendar.MONTH) + 1;
         Long firstDayOfMonth = getFirstDayOfMonth(month);
         Long lastDayOfMonth = getLastDayOfMonth(month);
+
         return ranKingUser;
 
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserPlanMapper.java

@@ -23,7 +23,7 @@ public interface UserPlanMapper extends BaseMapper<UserPlan> {
 
     List<CoursePlanVo> selectByListCourse(UserPlanQueryBo bo);
 
-    UserPlan selectByUserPlan(UserPlanQueryBo bo);
+    List<UserPlan> selectByUserPlan(UserPlanQueryBo bo);
 
     void insertSource(CoursePlanVo coursePlanVo);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserPlanService.java

@@ -59,7 +59,7 @@ public interface IUserPlanService extends IService<UserPlan> {
 	 */
 	UserPlanVo generate(UserPlanQueryBo bo) throws ParseException;
 
-	UserPlanVo userPlan(UserPlanQueryBo bo);
+	List<UserPlanVo> userPlan(UserPlanQueryBo bo);
 
 	Boolean updateGenerate(UserPlanQueryBo bo) throws ParseException;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java

@@ -203,39 +203,44 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
     }
 
     @Override
-    public UserPlanVo userPlan(UserPlanQueryBo bo) {
-        UserPlan userPlan = baseMapper.selectByUserPlan(bo);
-        UserPlanVo userPlanVo = new UserPlanVo();
-        userPlanVo.setUserId(userPlan.getUserId());
-        userPlanVo.setExamDate(userPlan.getExamDate());
-        userPlanVo.setReminderTime(userPlan.getReminderTime());
-        userPlanVo.setStudyDay(userPlan.getStudyDay());
-        userPlanVo.setStartTime(userPlan.getStartTime());
-        userPlanVo.setEndTime(userPlan.getEndTime());
-        userPlanVo.setPitchNum(userPlan.getPitchNum());
-        userPlanVo.setStudyNum(userPlan.getStudyNum());
-        userPlanVo.setPlanId(userPlan.getPlanId());
-
-        List<CalendarStudyVo> calendarStudyVos = JSONObject.parseArray(userPlan.getSchedule(), CalendarStudyVo.class);
-        List<Long> cont = JSONObject.parseArray(userPlan.getStudyCount(), Long.class);
-        Long[] strings = new Long[cont.size()];
-        cont.toArray(strings);
-        userPlanVo.setCalendarStudyVo(calendarStudyVos);
-        userPlanVo.setStudyCount(strings);
-        userPlanVo.setCoursePlanVo(null);
-        List<UserPlanCource> userPlanClsList = baseMapper.selectCourse(userPlan.getPlanId());
-
-        //初始化需要得到的数组
-        Integer[] array = new Integer[userPlanClsList.size()];
-
-        //使用for循环得到数组
-        for(int i = 0; i < userPlanClsList.size();i++){
-            array[i] = Convert.toInt(userPlanClsList.get(i).getSourceId());
+    public List<UserPlanVo> userPlan(UserPlanQueryBo bo) {
+        List<UserPlan> userPlans = baseMapper.selectByUserPlan(bo);
+        List<UserPlanVo> userPlanVos = new ArrayList<>();
+        for (UserPlan userPlan : userPlans) {
+            UserPlanVo userPlanVo = new UserPlanVo();
+            userPlanVo.setUserId(userPlan.getUserId());
+            userPlanVo.setExamDate(userPlan.getExamDate());
+            userPlanVo.setReminderTime(userPlan.getReminderTime());
+            userPlanVo.setStudyDay(userPlan.getStudyDay());
+            userPlanVo.setStartTime(userPlan.getStartTime());
+            userPlanVo.setEndTime(userPlan.getEndTime());
+            userPlanVo.setPitchNum(userPlan.getPitchNum());
+            userPlanVo.setStudyNum(userPlan.getStudyNum());
+            userPlanVo.setPlanId(userPlan.getPlanId());
+
+            List<CalendarStudyVo> calendarStudyVos = JSONObject.parseArray(userPlan.getSchedule(), CalendarStudyVo.class);
+            List<Long> cont = JSONObject.parseArray(userPlan.getStudyCount(), Long.class);
+            Long[] strings = new Long[cont.size()];
+            cont.toArray(strings);
+            userPlanVo.setCalendarStudyVo(calendarStudyVos);
+            userPlanVo.setStudyCount(strings);
+            userPlanVo.setCoursePlanVo(null);
+            List<UserPlanCource> userPlanClsList = baseMapper.selectCourse(userPlan.getPlanId());
+
+            //初始化需要得到的数组
+            Integer[] array = new Integer[userPlanClsList.size()];
+
+            //使用for循环得到数组
+            for(int i = 0; i < userPlanClsList.size();i++){
+                array[i] = Convert.toInt(userPlanClsList.get(i).getSourceId());
+            }
+            bo.setCourseId(array);
+            List<CoursePlanVo> coursePlanVo = baseMapper.selectByListCourse(bo);
+            userPlanVo.setCoursePlanVo(coursePlanVo);
+            userPlanVos.add(userPlanVo);
         }
-        bo.setCourseId(array);
-        List<CoursePlanVo> coursePlanVo = baseMapper.selectByListCourse(bo);
-        userPlanVo.setCoursePlanVo(coursePlanVo);
-        return userPlanVo;
+
+        return userPlanVos;
     }
 
     @Override