|
@@ -112,11 +112,11 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
|
|
|
|
|
|
Map<Date, Map<IndexDataType, Map<String, Integer>>> vipCategoryCourseListMap = new HashMap<>();
|
|
Map<Date, Map<IndexDataType, Map<String, Integer>>> vipCategoryCourseListMap = new HashMap<>();
|
|
if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains("VIP_GROUP_COURSE")||dataTypes.contains("VIP_GROUP_ONLINE_COURSE")||dataTypes.contains("VIP_GROUP_OFFLINE_COURSE")){
|
|
if(CollectionUtils.isEmpty(dataTypes)||dataTypes.contains("VIP_GROUP_COURSE")||dataTypes.contains("VIP_GROUP_ONLINE_COURSE")||dataTypes.contains("VIP_GROUP_OFFLINE_COURSE")){
|
|
- dataTypes.clear();
|
|
|
|
- dataTypes.add("VIP_GROUP_COURSE");
|
|
|
|
- dataTypes.add("VIP_GROUP_ONLINE_COURSE");
|
|
|
|
- dataTypes.add("VIP_GROUP_OFFLINE_COURSE");
|
|
|
|
- List<IndexBaseMonthData> indexBaseDataList = indexBaseMonthDataDao.getIndexBaseDataList(organIds, dataTypes, startDate.toString(), endDate.toString());
|
|
|
|
|
|
+ Set<String> vipDataTypes = new HashSet<>();
|
|
|
|
+ vipDataTypes.add("VIP_GROUP_COURSE");
|
|
|
|
+ vipDataTypes.add("VIP_GROUP_ONLINE_COURSE");
|
|
|
|
+ vipDataTypes.add("VIP_GROUP_OFFLINE_COURSE");
|
|
|
|
+ List<IndexBaseMonthData> indexBaseDataList = indexBaseMonthDataDao.getIndexBaseDataList(organIds, vipDataTypes, startDate.toString(), endDate.toString());
|
|
if(!CollectionUtils.isEmpty(indexBaseDataList)){
|
|
if(!CollectionUtils.isEmpty(indexBaseDataList)){
|
|
for (IndexBaseMonthData indexBaseMonthData : indexBaseDataList) {
|
|
for (IndexBaseMonthData indexBaseMonthData : indexBaseDataList) {
|
|
if(StringUtils.isBlank(indexBaseMonthData.getExtendInfo())){
|
|
if(StringUtils.isBlank(indexBaseMonthData.getExtendInfo())){
|