|
|
@@ -301,21 +301,21 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
|
|
|
taskList.sort((t1, t2) -> {
|
|
|
PointUserActivityTaskCompletion comp1 = completionMap.get(t1.getId());
|
|
|
PointUserActivityTaskCompletion comp2 = completionMap.get(t2.getId());
|
|
|
-
|
|
|
+
|
|
|
// 判断是否已完成
|
|
|
boolean isCompleted1 = comp1 != null;
|
|
|
boolean isCompleted2 = comp2 != null;
|
|
|
-
|
|
|
+
|
|
|
// 未完成优先
|
|
|
if (isCompleted1 != isCompleted2) {
|
|
|
return isCompleted1 ? 1 : -1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 同一状态按创建时间正序排列
|
|
|
if (t1.getCreateTime() != null && t2.getCreateTime() != null) {
|
|
|
return t1.getCreateTime().compareTo(t2.getCreateTime());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return 0;
|
|
|
});
|
|
|
|
|
|
@@ -396,6 +396,8 @@ public class PointActivityServiceImpl extends ServiceImpl<PointActivityMapper, P
|
|
|
vo.setStatus(2); // 2: 今天未签到
|
|
|
} else if (actuallySigned) {
|
|
|
vo.setStatus(1); // 1: 已签
|
|
|
+ } else if (date.isAfter(today)) {
|
|
|
+ vo.setStatus(0); // 0: 未来日期 = 没到时间没签
|
|
|
} else {
|
|
|
// 没签到的情况 (且不是今天)
|
|
|
// 计算该日期距离今天的天数
|