Commit e96b2112 authored by shiyu's avatar shiyu

查询签到信息3

parent c95480ad
...@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory; ...@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@Service @Service
...@@ -59,6 +60,7 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService { ...@@ -59,6 +60,7 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
public Result findTaskList(QdUserSignInTaskRequestDto dto) { public Result findTaskList(QdUserSignInTaskRequestDto dto) {
try { try {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
SimpleDateFormat timeFormat = new SimpleDateFormat("H:mm");
List<SignInTaskVo> selfTaskVoList = new ArrayList<>(); List<SignInTaskVo> selfTaskVoList = new ArrayList<>();
//查询自己创建的任务 //查询自己创建的任务
dto.setIsSelf(true); dto.setIsSelf(true);
...@@ -71,6 +73,12 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService { ...@@ -71,6 +73,12 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
if (qdUserSignIn != null) { if (qdUserSignIn != null) {
signInTaskVo.setIsTodaySignIn(true); signInTaskVo.setIsTodaySignIn(true);
} }
if (signInTask.getSignInStartTime() != null && signInTask.getSignInEndTime() != null) {
String start = timeFormat.format(signInTask.getSignInStartTime());
String end = timeFormat.format(signInTask.getSignInEndTime());
String timeRange = "每天 " + start + " - " + end;
signInTaskVo.setSignInTime(timeRange);
}
selfTaskVoList.add(signInTaskVo); selfTaskVoList.add(signInTaskVo);
} }
map.put("selfTaskVoList", selfTaskVoList); map.put("selfTaskVoList", selfTaskVoList);
...@@ -89,6 +97,12 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService { ...@@ -89,6 +97,12 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
if (qdUserSignIn != null) { if (qdUserSignIn != null) {
signInTaskVo.setIsTodaySignIn(true); signInTaskVo.setIsTodaySignIn(true);
} }
if (signInTask.getSignInStartTime() != null && signInTask.getSignInEndTime() != null) {
String start = timeFormat.format(signInTask.getSignInStartTime());
String end = timeFormat.format(signInTask.getSignInEndTime());
String timeRange = "每天 " + start + " - " + end;
signInTaskVo.setSignInTime(timeRange);
}
otherTaskVoList.add(signInTaskVo); otherTaskVoList.add(signInTaskVo);
} }
map.put("otherTaskVoList", otherTaskVoList); map.put("otherTaskVoList", otherTaskVoList);
......
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