mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-11 03:46:50 +08:00
fix:学习记录查询/导出接口中,学习时长条件查询重新赋值补全实体类解耦逻辑,避免影响原表数据
This commit is contained in:
@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.context.annotation.Lazy;
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.persistence.EntityManager;
|
||||||
import javax.transaction.Transactional;
|
import javax.transaction.Transactional;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -100,6 +101,13 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
|
|||||||
@Autowired(required = false)
|
@Autowired(required = false)
|
||||||
ICourseStudySearch esSearch;//对ES的处理
|
ICourseStudySearch esSearch;//对ES的处理
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用于避免JPA查询后修改entity实体字段,自动更新到数据库
|
||||||
|
*/
|
||||||
|
@Autowired
|
||||||
|
private EntityManager entityManager;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public StudyCourse findByCourseIdAndAid(String courseId, String aid) {
|
public StudyCourse findByCourseIdAndAid(String courseId, String aid) {
|
||||||
//加上排序,如果是多条学习记录,只会取最新的一条
|
//加上排序,如果是多条学习记录,只会取最新的一条
|
||||||
@@ -219,6 +227,8 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
|
|||||||
String queryStartTime = sc.getQueryStartTime();
|
String queryStartTime = sc.getQueryStartTime();
|
||||||
String queryFinishTime = sc.getQueryFinishTime();
|
String queryFinishTime = sc.getQueryFinishTime();
|
||||||
for (StudyCourse studyCourse : studyCourses) {
|
for (StudyCourse studyCourse : studyCourses) {
|
||||||
|
// 实体类解耦
|
||||||
|
entityManager.detach(studyCourse);
|
||||||
// 解析查询时间范围
|
// 解析查询时间范围
|
||||||
LocalDate startDate = LocalDate.parse(queryStartTime);
|
LocalDate startDate = LocalDate.parse(queryStartTime);
|
||||||
LocalDate endDate = LocalDate.parse(queryFinishTime);
|
LocalDate endDate = LocalDate.parse(queryFinishTime);
|
||||||
@@ -860,6 +870,8 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
|
|||||||
String queryStartTime = sc.getQueryStartTime();
|
String queryStartTime = sc.getQueryStartTime();
|
||||||
String queryFinishTime = sc.getQueryFinishTime();
|
String queryFinishTime = sc.getQueryFinishTime();
|
||||||
for (StudyCourse studyCourse : studyCourses) {
|
for (StudyCourse studyCourse : studyCourses) {
|
||||||
|
// 实体类解耦
|
||||||
|
entityManager.detach(studyCourse);
|
||||||
// 解析查询时间范围
|
// 解析查询时间范围
|
||||||
LocalDate startDate = LocalDate.parse(queryStartTime);
|
LocalDate startDate = LocalDate.parse(queryStartTime);
|
||||||
LocalDate endDate = LocalDate.parse(queryFinishTime);
|
LocalDate endDate = LocalDate.parse(queryFinishTime);
|
||||||
|
|||||||
Reference in New Issue
Block a user