签到反馈

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

@@ -71,7 +71,7 @@ public class PlanController extends BaseController {
      */
     @ApiOperation("获得七天活动计划")
     @GetMapping("/userPlanSeven")
-    public AjaxResult<List<CalendarStudyVo>> userPlanSeven(UserPlanQueryBo bo) throws ParseException {
+    public AjaxResult<UserPlanVo> userPlanSeven(UserPlanQueryBo bo) throws ParseException {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(userPlanService.userPlanSeven(bo));

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

@@ -173,6 +173,9 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
             continuousSignInDay =1;
         }
         int fen = activityTaskVo.getAccIntegral()*continuousSignInDay;
+        if (userVo.getIntegral() == null){
+            userVo.setIntegral(0L);
+        }
         Long score = userVo.getIntegral()+fen;
 
         //分数达到的等级赋予学生等级

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

@@ -64,5 +64,5 @@ public interface IUserPlanService extends IService<UserPlan> {
 
 	Boolean updateGenerate(UserPlanAddBo bo) throws ParseException;
 
-	List<CalendarStudyVo> userPlanSeven(UserPlanQueryBo bo);
+	UserPlanVo userPlanSeven(UserPlanQueryBo bo);
 }

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

@@ -383,8 +383,30 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
     }
 
     @Override
-    public List<CalendarStudyVo> userPlanSeven(UserPlanQueryBo bo) {
+    public UserPlanVo userPlanSeven(UserPlanQueryBo bo) {
+        UserPlan userPlan = baseMapper.selectByUserPlan(bo).get(0);
+        UserPlanVo userPlanVos = new UserPlanVo();
+        Calendar cal = Calendar.getInstance();
+
+        //得到日历日期
+        List<CalendarStudyVo> calendarStudyVos = JSONObject.parseArray(userPlan.getSchedule(), CalendarStudyVo.class);
+
+
+        //获得计划的课程
+        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);
+
+
         return null;
+
+
     }
 
     private UserPlanVo generateSelfBo(UserPlanQueryBo bo) throws ParseException {

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

@@ -124,8 +124,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                   AND user_id = #{userId}
         <if test="planId != null and planId !=''">
             and plan_id = #{planId}
-
         </if>
+        order by exam_date
     </select>
 
     <insert id="insertSource" parameterType="map" useGeneratedKeys="true" keyProperty="id" >