Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -210,7 +210,7 @@ public class MusicGroup extends BaseEntity {
 	private Integer musicGroupPlanMakingId;
 	
 	@ApiModelProperty(value = "成团年级",required = false)
-	private Integer firstRecruitGrade;
+	private String firstRecruitGrade;
 	
 	@ApiModelProperty(value = "默认收费标准",required = false)
 	private BigDecimal defaultChargeStandard;
@@ -750,11 +750,11 @@ public class MusicGroup extends BaseEntity {
 		this.musicGroupPlanMakingId = musicGroupPlanMakingId;
 	}
 
-	public Integer getFirstRecruitGrade() {
+	public String getFirstRecruitGrade() {
 		return firstRecruitGrade;
 	}
 
-	public void setFirstRecruitGrade(Integer firstRecruitGrade) {
+	public void setFirstRecruitGrade(String firstRecruitGrade) {
 		this.firstRecruitGrade = firstRecruitGrade;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/TempUserTrainingTimeDetailVo.java

@@ -21,7 +21,7 @@ public class TempUserTrainingTimeDetailVo implements Serializable {
     @ApiModelProperty(value = "训练时长/秒-保留2位")
     private BigDecimal playTime;
 
-    @ApiModelProperty(value = "是否完成训练  0-未完成 1-已完成")
+    @ApiModelProperty(value = "是否完成训练  -1:未练习 0-未完成 1-已完成")
     private Integer isFinish;
 
     @ApiModelProperty(value = "打卡标准")

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

@@ -240,7 +240,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
             tempUserTrainingTimeDetailVo.setUserId(userId);
             tempUserTrainingTimeDetailVo.setTrainingDate(DateUtil.toDate(generateDate.toString()));
             tempUserTrainingTimeDetailVo.setPlayTime(BigDecimal.ZERO);
-            tempUserTrainingTimeDetailVo.setIsFinish(0);
+            tempUserTrainingTimeDetailVo.setIsFinish(-1);
             tempUserTrainingTimeDetailVo.setSignStandard(camp.getSignStandard());
             tempUserTrainingTimeDetailVo.setStandardDays(camp.getStandardDays());
             resultList.add(tempUserTrainingTimeDetailVo);
@@ -260,6 +260,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
                 BigDecimal t = nowTrainingTime.get(s);
                 if (Objects.nonNull(t)) {
                     vo.setPlayTime(t);
+                    vo.setIsFinish(0);
                     //大于1200秒
                     if (t.intValue() > camp.getSignStandard() * 60) {
                         vo.setIsFinish(1);
@@ -284,7 +285,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         //训练营详情-查询条件时间设置
         queryUserTrainingDetailOpsParam(param);
         Page<TempCampUserTrainingDetailVo> page = PageUtil.getPageInfo(param);
-        page.setDesc("t.playDay");
+        page.setDesc("t.playDay,t.id");
         IPage<TempCampUserTrainingDetailVo> vos = baseMapper.queryUserTrainingDetailV2(page, param);
         List<TempCampUserTrainingDetailVo> records = vos.getRecords();
         if(CollectionUtils.isNotEmpty(records)){