签到反馈

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<List<CalendarStudyVo>> 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/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;
+
+	List<CalendarStudyVo> 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,11 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         return true;
     }
 
+    @Override
+    public List<CalendarStudyVo> userPlanSeven(UserPlanQueryBo bo) {
+        return null;
+    }
+
     private UserPlanVo generateSelfBo(UserPlanQueryBo bo) throws ParseException {