Commit 6ae6e41a authored by shiyu's avatar shiyu

排行榜中展示参加但未打卡的用户2

parent 96c42524
...@@ -53,16 +53,29 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService { ...@@ -53,16 +53,29 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
@Override @Override
public Result join(QdUserSignInTaskRequestDto dto) { public Result join(QdUserSignInTaskRequestDto dto) {
try { try {
Date now = new Date();
SignInTask signInTask = signInTaskDao.findById(dto.getTaskId()); SignInTask signInTask = signInTaskDao.findById(dto.getTaskId());
QdUserSignInTask qdUserSignInTask = new QdUserSignInTask(); QdUserSignInTask qdUserSignInTask = new QdUserSignInTask();
qdUserSignInTask.setUserId(dto.getUserId()); qdUserSignInTask.setUserId(dto.getUserId());
qdUserSignInTask.setTaskId(dto.getTaskId()); qdUserSignInTask.setTaskId(dto.getTaskId());
qdUserSignInTask.setIsSelf(signInTask.getCreatorId() == dto.getUserId().longValue()); qdUserSignInTask.setIsSelf(signInTask.getCreatorId() == dto.getUserId().longValue());
qdUserSignInTask.setCreateTime(new Date()); qdUserSignInTask.setCreateTime(now);
qdUserSignInTask.setUpdateTime(new Date()); qdUserSignInTask.setUpdateTime(now);
qdUserSignInTask.setIsValid(true); qdUserSignInTask.setIsValid(true);
qdUserSignInTask.setState(SignInTaskEnum.StateEnum.PROCESSING.getCode()); qdUserSignInTask.setState(SignInTaskEnum.StateEnum.PROCESSING.getCode());
qdUserSignInTaskDao.insert(qdUserSignInTask); qdUserSignInTaskDao.insert(qdUserSignInTask);
//新增数据
QdSignInRanking qdSignInRanking = new QdSignInRanking();
qdSignInRanking.setIsValid(true);
qdSignInRanking.setTotalSignInDays(0);
qdSignInRanking.setUserId(dto.getUserId());
qdSignInRanking.setTaskId(dto.getTaskId());
qdSignInRanking.setAddTaskTime(now);
qdSignInRanking.setCreateTime(now);
qdSignInRanking.setUpdateTime(now);
qdSignInRankingDao.insert(qdSignInRanking);
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("加入签到任务 error:{}", e); logger.error("加入签到任务 error:{}", e);
...@@ -281,7 +294,7 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService { ...@@ -281,7 +294,7 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
} }
dataList.add(chartsListInfo); dataList.add(chartsListInfo);
} }
int listSize = list.size(); /* int listSize = list.size();
//点击参加了但是尚未打卡的用户也在排行榜中展示 //点击参加了但是尚未打卡的用户也在排行榜中展示
if (listSize < 100) { if (listSize < 100) {
int limit = 100 - list.size(); int limit = 100 - list.size();
...@@ -305,7 +318,7 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService { ...@@ -305,7 +318,7 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
chartsListInfo.put("totalDays", list.get(i).getTotalSignInDays()); chartsListInfo.put("totalDays", list.get(i).getTotalSignInDays());
dataList.add(chartsListInfo); dataList.add(chartsListInfo);
} }
} }*/
resultMap.put("currentUserName", cUser.getNickName()); resultMap.put("currentUserName", cUser.getNickName());
resultMap.put("currentAvatar", cUser.getAvatar()); resultMap.put("currentAvatar", cUser.getAvatar());
resultMap.put("currentAvatar", cUser.getAvatar()); resultMap.put("currentAvatar", cUser.getAvatar());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment