Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ClassGroup4MixDto.java

@@ -22,6 +22,9 @@ public class ClassGroup4MixDto implements Cloneable{
     @ApiModelProperty(value = "班级名称", required = true)
     private String classGroupName;
 
+    @ApiModelProperty(value = "是否只生成班级")
+    private Boolean onlyCreateClassGroup;
+
     @ApiModelProperty(value = "学生ids", required = true)
     private List<Integer> students;
 
@@ -64,6 +67,14 @@ public class ClassGroup4MixDto implements Cloneable{
     @ApiModelProperty(value = "班级", required = true)
     private ClassGroup classGroup;
 
+    public Boolean getOnlyCreateClassGroup() {
+        return onlyCreateClassGroup;
+    }
+
+    public void setOnlyCreateClassGroup(Boolean onlyCreateClassGroup) {
+        this.onlyCreateClassGroup = onlyCreateClassGroup;
+    }
+
     public ClassGroup getClassGroup() {
         return classGroup;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -72,12 +72,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		nowDate = nowDate.withDayOfMonth(1);
 		Date currentMonth = Date.from(nowDate.atStartOfDay(DateUtil.zoneId).toInstant());
 
-		LocalDate startDate = LocalDate.now();
+		LocalDate startDate = nowDate.plusDays(-30);
 		if(Objects.nonNull(queryInfo.getStartDate())){
 			startDate = LocalDateTime.ofInstant(queryInfo.getStartDate().toInstant(), DateUtil.zoneId).toLocalDate();
 		}
 
-		LocalDate endDate = startDate.withMonth(12);
+		LocalDate endDate = nowDate.plusDays(-1);
 		if(Objects.nonNull(queryInfo.getEndDate())){
 			endDate = LocalDateTime.ofInstant(queryInfo.getEndDate().toInstant(), DateUtil.zoneId).toLocalDate();
 		}
@@ -148,7 +148,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 
 		if(StringUtils.isBlank(dayStr)){
-			dayStr = nowDate.toString();
+			dayStr = nowDate.plusDays(-1).toString();
 		}
 
 		//运营数据

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -925,7 +925,7 @@
     <select id="queryRequiredOverList" resultMap="VipGroup">
         select vg.*
         from vip_group vg
-                 left join class_group cg on vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
+            left join class_group cg on vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
         where vg.group_status_ = 2
           and cg.total_class_times_ = cg.current_class_times_
           and cg.total_class_times_ &gt; 0