签到反馈

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

@@ -184,6 +184,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
                 l.setActivityTaskTimeVo(activityTaskTimeVo);
             }
             ActivityTaskVo activityTaskVo = queryByTaskId(Convert.toLong(l.getTaskType()));
+            l.setUserStatus(0);
             switch (l.getTaskType()){
                 //每日签到逻辑，当日有领取即无法签到
                 case 0:
@@ -193,7 +194,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
                     lqw.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
                     List<ActivityTaskUser> list = activityTaskUserService.list(lqw);
                     if (!CollectionUtils.isEmpty(list) && list.size() > 0){
-                        throw new IllegalArgumentException("已签到请勿重复签到");
+                        l.setUserStatus(1);
                     }
                     break;
                 //完善信息  按照百分比求得乘以分数得到奖励分数
@@ -206,11 +207,12 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
                     for (ActivityTaskUser activityTaskUser : listWan) {
                         bigDecimal = bigDecimal.add(new BigDecimal(activityTaskUser.getScore()));
                     }
-                    if (bigDecimal.compareTo(new BigDecimal(activityTaskVo.getAccIntegral())) != 0){
-                        throw new IllegalArgumentException("已完善信息领取完成，无法再次领取");
+                    if (bigDecimal.compareTo(new BigDecimal(activityTaskVo.getStartIntegral())) == 0){
+                        l.setUserStatus(1);
                     }
                     break;
                 case 2:
+                    l.setUserStatus(0);
                     break;
                 case 3:
                     //每日分享，大于三次达到上线
@@ -220,7 +222,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
                     useMei.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
                     List<ActivityTaskUser> listMei = activityTaskUserService.list(useMei);
                     if (!CollectionUtils.isEmpty(listMei) && listMei.size() == 3){
-                        throw new IllegalArgumentException("当日分享已达上线");
+                        l.setUserStatus(1);
                     }
                     break;
                 case 4:
@@ -235,6 +237,7 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
                         score = score+ Convert.toInt(activityTaskUser.getScore());
                     }
                     if (!CollectionUtils.isEmpty(listStudy) && activityTaskVo.getEndIntegral().equals(score)){
+                        l.setUserStatus(1);
                     }
                     break;
                 case 5:
@@ -244,9 +247,10 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
                     practice.between(ActivityTaskUser::getCreateTime,getTimesmorning(),getTimesnight());
                     List<ActivityTaskUser> listPractice = activityTaskUserService.list(practice);
                     if (!CollectionUtils.isEmpty(listPractice) && listPractice.size() > 0){
-                        throw new IllegalArgumentException("当日领取连续模拟考试积分已达上线");
+                        l.setUserStatus(1);
                     }
                     break;
+
             }
         });
 

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

@@ -64,8 +64,8 @@ public class ActivityTaskVo {
 	@ApiModelProperty("0 停用 1启用")
 	private Integer status;
 
-	@Excel(name = "0 当日已完成 1未完成")
-	@ApiModelProperty("0 当日已完成 1未完成")
+	@Excel(name = "0 未完成 1 已完成")
+	@ApiModelProperty("0 未完成 1 已完成")
 	private Integer userStatus;
 
 	/** 分数范围 适用与考试积分获得 */

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

@@ -408,8 +408,9 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             userPlanVos.setCoursePlanVo(coursePlanVo);
             List<DayStudyVo> dayStudyVos = new ArrayList<>();
             calendarStudyVos.stream().filter(c -> c.getMonth() == cal.get(Calendar.MONTH + 1)).forEach(c -> {
-                c.getDayStudyList().stream()
-                        .filter(v -> v.getDate() < 7 + cal.get(Calendar.DAY_OF_MONTH) || v.getDate() > cal.get(Calendar.DAY_OF_MONTH) - 7);
+                List<DayStudyVo> collect = c.getDayStudyList().stream()
+                        .filter(v -> v.getDate() < 7 + cal.get(Calendar.DAY_OF_MONTH) || v.getDate() > cal.get(Calendar.DAY_OF_MONTH) - 7)
+                        .collect(Collectors.toList());
             });
             userPlanVos.setCalendarStudyVo(calendarStudyVos);
         }