|
@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dao.SysMusicCompareRecordDao;
|
|
import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
import com.ym.mec.biz.dal.dto.*;
|
|
import com.ym.mec.biz.dal.dto.*;
|
|
import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
|
|
import com.ym.mec.biz.dal.entity.SysMusicCompareRecord;
|
|
|
|
+import com.ym.mec.biz.dal.enums.FeatureType;
|
|
import com.ym.mec.biz.dal.page.SysMusicCompareRecordQueryInfo;
|
|
import com.ym.mec.biz.dal.page.SysMusicCompareRecordQueryInfo;
|
|
import com.ym.mec.biz.service.SysMusicCompareRecordService;
|
|
import com.ym.mec.biz.service.SysMusicCompareRecordService;
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
@@ -13,13 +14,11 @@ import com.ym.mec.common.page.PageInfo;
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
import com.ym.mec.common.service.impl.BaseServiceImpl;
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
import com.ym.mec.util.date.DateUtil;
|
|
import com.ym.mec.util.date.DateUtil;
|
|
-import org.apache.poi.ss.formula.functions.T;
|
|
|
|
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 org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
-import java.time.DayOfWeek;
|
|
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -46,6 +45,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
|
|
SysMusicCompareRecord sysMusicCompareRecord = new SysMusicCompareRecord();
|
|
SysMusicCompareRecord sysMusicCompareRecord = new SysMusicCompareRecord();
|
|
sysMusicCompareRecord.setUserId(user.getId());
|
|
sysMusicCompareRecord.setUserId(user.getId());
|
|
sysMusicCompareRecord.setSysMusicScoreId(soundCompareInfo.getMusicScoreId());
|
|
sysMusicCompareRecord.setSysMusicScoreId(soundCompareInfo.getMusicScoreId());
|
|
|
|
+ sysMusicCompareRecord.setBehaviorId(soundCompareInfo.getBehaviorId());
|
|
sysMusicCompareRecord.setScoreData(JSON.toJSONString(soundCompareInfo.getUserMeasureScoreMap()));
|
|
sysMusicCompareRecord.setScoreData(JSON.toJSONString(soundCompareInfo.getUserMeasureScoreMap()));
|
|
if (Objects.nonNull(soundCompareInfo.getUserMeasureScoreMap()) && soundCompareInfo.getUserMeasureScoreMap().containsKey(-1)){
|
|
if (Objects.nonNull(soundCompareInfo.getUserMeasureScoreMap()) && soundCompareInfo.getUserMeasureScoreMap().containsKey(-1)){
|
|
Map<String, Object> finalScore = soundCompareInfo.getUserMeasureScoreMap().get(-1);
|
|
Map<String, Object> finalScore = soundCompareInfo.getUserMeasureScoreMap().get(-1);
|