fix

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

@@ -56,9 +56,9 @@ public class ActivityConfigurationController extends BaseController {
      */
     @ApiOperation("查询活动配置列表")
     @GetMapping("/list")
-    public TableDataInfo<CourseConfigurationVo> list(ActivityConfigurationQueryBo bo) {
+    public TableDataInfo<ActivityConfigurationVo> list(ActivityConfigurationQueryBo bo) {
         startPage();
-        List<CourseConfigurationVo> list = iActivityConfigurationService.queryIssueList(bo);
+        List<ActivityConfigurationVo> list = iActivityConfigurationService.queryIssueList(bo);
         return getDataTable(list);
     }
 

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

@@ -15,6 +15,7 @@ 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.CalendarStudyVo;
 import com.zhongzheng.modules.user.vo.UserPlanVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -65,6 +66,18 @@ public class PlanController extends BaseController {
     }
 
 
+    /**
+     * 获得七天活动计划
+     */
+    @ApiOperation("获得七天活动计划")
+    @GetMapping("/userPlanSeven")
+    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-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -71,9 +71,11 @@ public class UserController extends BaseController {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         int collectTotal = iUserService.getCollectTotal(loginUser.getUser().getUserId());
         Integer rank = iUserService.getRank(loginUser.getUser().getUserId());
+        Integer issue = iUserService.getIssue(loginUser.getUser().getUserId());
         Map<String,Object> map = new HashMap<>();
         map.put("collectTotal",collectTotal);
         map.put("rank",rank);
+        map.put("issue",issue);
         return AjaxResult.success(map);
     }
 

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

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.activity.domain.ActivityTaskUser;
+import com.zhongzheng.modules.activity.service.IActivityTaskUserService;
 import com.zhongzheng.modules.collect.domain.CollectBank;
 import com.zhongzheng.modules.collect.domain.CollectCourse;
 import com.zhongzheng.modules.collect.domain.CollectNote;
@@ -36,6 +38,9 @@ import java.sql.Timestamp;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.zhongzheng.modules.activity.service.impl.ActivityTaskUserServiceImpl.getTimesmorning;
+import static com.zhongzheng.modules.activity.service.impl.ActivityTaskUserServiceImpl.getTimesnight;
+
 /**
  * 用户Service业务层处理
  *
@@ -54,6 +59,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private CollectNoteMapper collectNoteMapper;
 
+    @Autowired
+    private IActivityTaskUserService activityTaskUserService;
+
 
     @Override
     public UserVo queryById(Long userId) {
@@ -259,6 +267,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return 0;
     }
 
+    @Override
+    public Integer getIssue(Long userId) {
+        LambdaQueryWrapper<ActivityTaskUser> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ActivityTaskUser::getTaskType,0);
+        lqw.eq(userId !=null,ActivityTaskUser::getUserId,userId);
+        lqw.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
+        List<ActivityTaskUser> list = activityTaskUserService.list(lqw);
+        if (!CollectionUtils.isEmpty(list) && list.size() > 0){
+            return 1;
+        }
+        return 0;
+    }
+
     /**
      * 获取当前月第一天
      * @param month

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<CourseConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
+    Collection<ActivityConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
 
 
     /**

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

@@ -59,7 +59,7 @@ public interface IActivityConfigurationService extends IService<ActivityConfigur
 	 * @param bo
 	 * @return List<CourseConfigurationVo>
 	 */
-    List<CourseConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo);
+    List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo);
 
 	/**
 	 * 查询活动课程

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

@@ -132,9 +132,9 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     }
 
     @Override
-    public List<CourseConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo) {
+    public List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo) {
         bo.setStartTime(DateUtils.getNowTime());
-        List<CourseConfigurationVo> courseConfigurationVos = entityCourseVo(baseMapper.selectConfiguraIssueList(bo));
+        List<ActivityConfigurationVo> courseConfigurationVos = entityCourseVo(baseMapper.selectConfiguraIssueList(bo));
         return courseConfigurationVos;
     }
 
@@ -156,13 +156,13 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
      * @param collection 实体类集合
      * @return
      */
-    private List<CourseConfigurationVo> entityCourseVo(Collection<CourseConfigurationVo> collection) {
-        List<CourseConfigurationVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, CourseConfigurationVo.class))
+    private List<ActivityConfigurationVo> entityCourseVo(Collection<ActivityConfigurationVo> collection) {
+        List<ActivityConfigurationVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityConfigurationVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<CourseConfigurationVo> page = (Page<CourseConfigurationVo>)collection;
-            Page<CourseConfigurationVo> pageVo = new Page<>();
+            Page<ActivityConfigurationVo> page = (Page<ActivityConfigurationVo>)collection;
+            Page<ActivityConfigurationVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
             voList = pageVo;

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/activity/vo/ActivityConfigurationVo.java

@@ -85,6 +85,7 @@ public class ActivityConfigurationVo {
 	@ApiModelProperty("有效期几个月")
 	private Integer couponEnd;
 
+
 	/** 绑定课程 */
 	@Excel(name = "绑定课程")
 	@ApiModelProperty("绑定课程")

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseVo.java

@@ -72,5 +72,9 @@ public class CourseVo {
 	@ApiModelProperty("分类名")
 	private String categoryName;
 
+	@Excel(name = "是否已经领取  yes领取 no 未领取")
+	@ApiModelProperty("是否已经领取  yes领取 no 未领取")
+	private String useStatus;
+
 
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.service;
 
 import com.zhongzheng.modules.user.domain.UserPlan;
+import com.zhongzheng.modules.user.vo.CalendarStudyVo;
 import com.zhongzheng.modules.user.vo.UserPlanVo;
 import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
 import com.zhongzheng.modules.user.bo.UserPlanAddBo;
@@ -62,4 +63,6 @@ public interface IUserPlanService extends IService<UserPlan> {
 	List<UserPlanVo> userPlan(UserPlanQueryBo bo);
 
 	Boolean updateGenerate(UserPlanAddBo bo) throws ParseException;
+
+	UserPlanVo userPlanSeven(UserPlanQueryBo bo);
 }

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

@@ -62,4 +62,6 @@ public interface IUserService extends IService<User> {
 	RanKingUser rankingList(RanKingUserQuery bo);
 
 	Integer getRank(Long userId);
+
+    Integer getIssue(Long userId);
 }

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

@@ -382,6 +382,33 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         return true;
     }
 
+    @Override
+    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/activity/ActivityConfigurationMapper.xml

@@ -53,7 +53,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseName" column="course_name"/>
     </resultMap>
 
-    <resultMap type="com.zhongzheng.modules.course.vo.CourseConfigurationVo" id="CourseResultConfiguration">
+    <resultMap type="com.zhongzheng.modules.activity.vo.ActivityConfigurationVo" id="CourseResultConfiguration">
+        <result property="id" column="sid"/>
+        <result property="activityName" column="sactivity_name"/>
+        <result property="activityType" column="sactivity_type"/>
+        <result property="description" column="sdescription"/>
+        <result property="startTime" column="sstart_time"/>
+        <result property="endTime" column="send_time"/>
+        <result property="price" column="sprice"/>
+        <result property="quantity" column="squantity"/>
+        <result property="liveContent" column="slive_content"/>
+        <result property="liveAdress" column="slive_adress"/>
+        <result property="createTime" column="screate_time"/>
+        <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" />
+
+
+    </resultMap>
+
+    <resultMap id="courses" type="com.zhongzheng.modules.course.vo.CourseVo">
         <result property="courseId" column="course_id"/>
         <result property="categoryId" column="category_id"/>
         <result property="price" column="price"/>
@@ -66,22 +86,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="teacherIds" column="teacher_ids"/>
         <result property="courseName" column="course_name"/>
         <result property="useStatus" column="useStatus"/>
-        <association property="activityConfigurationVo" javaType="com.zhongzheng.modules.activity.vo.ActivityConfigurationVo" >
-            <result property="id" column="sid"/>
-            <result property="activityName" column="sactivity_name"/>
-            <result property="activityType" column="sactivity_type"/>
-            <result property="description" column="sdescription"/>
-            <result property="startTime" column="sstart_time"/>
-            <result property="endTime" column="send_time"/>
-            <result property="price" column="sprice"/>
-            <result property="quantity" column="squantity"/>
-            <result property="liveContent" column="slive_content"/>
-            <result property="liveAdress" column="slive_adress"/>
-            <result property="createTime" column="screate_time"/>
-            <result property="updateTime" column="supdate_time"/>
-            <result property="status" column="sstatus"/>
-            <result property="couponEnd" column="scoupon_end"/>
-        </association>
     </resultMap>
 
     <select id="selectConfiguraList" parameterType="com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo" resultMap="ActivityConfigurationResultVO">

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" >