|
@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.dayou.common.BaseEntity;
|
|
|
+import com.dayou.dto.PersonalTargetEvaData;
|
|
|
import com.dayou.dto.TaskRecordDTO;
|
|
|
import com.dayou.entity.Personal;
|
|
|
import com.dayou.entity.PersonalTarget;
|
|
@@ -14,6 +15,7 @@ import com.dayou.mapper.PersonalTargetMapper;
|
|
|
import com.dayou.service.IPersonalService;
|
|
|
import com.dayou.service.IPersonalTargetService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.dayou.utils.DateUtils;
|
|
|
import com.dayou.vo.*;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -35,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.sql.Struct;
|
|
|
import java.util.Collections;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -203,4 +206,9 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
|
|
|
}).collect(Collectors.toList());
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<PersonalTargetEvaData> queryPersonalTargetEvaData(PersonalTargetEvaData evaData) {
|
|
|
+ return personalTargetMapper.queryPersonalTargetEvaData(evaData.getStartTime());
|
|
|
+ }
|
|
|
}
|