Merge branch 'vip_group_activity'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentExercisesSituationQueryInfo.java

@@ -48,6 +48,17 @@ public class StudentExercisesSituationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "作业提交截至时间")
     private String submitEndDate;
 
+    @ApiModelProperty(value = "服务是否异常")
+    private Boolean serviceIsError;
+
+    public Boolean getServiceIsError() {
+        return serviceIsError;
+    }
+
+    public void setServiceIsError(Boolean serviceIsError) {
+        this.serviceIsError = serviceIsError;
+    }
+
     public String getSubmitStartDate() {
         return submitStartDate;
     }

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

@@ -3686,7 +3686,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					ts.setUpdateTime(date);
 					ts.setUserId(teacherId);
 
-					if(Objects.nonNull(mainTeacherSalary)&&!mainTeacherSalary.getEnableChangeSalary()){
+					if(TeachTypeEnum.BISHOP.equals(ts.getTeacherRole())&&Objects.nonNull(mainTeacherSalary)&&!mainTeacherSalary.getEnableChangeSalary()){
 						ts.setExpectSalary(mainTeacherSalary.getExpectSalary());
 						ts.setSubsidy(mainTeacherSalary.getSubsidy());
 						ts.setEnableChangeSalary(mainTeacherSalary.getEnableChangeSalary());

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

@@ -2391,8 +2391,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 courseScheduleTeacherSalary.setExpectSalary(salary);
             }
             courseScheduleTeacherSalary.setSubsidy(subsidy);
-            courseScheduleTeacherSalary.setEnableChangeSalary(false);
             courseScheduleTeacherSalary.setUpdateTime(new Date());
+            if(TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole())){
+                courseScheduleTeacherSalary.setEnableChangeSalary(false);
+            }else{
+                courseScheduleTeacherSalary.setEnableChangeSalary(true);
+            }
             courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
         }
         return true;

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

@@ -469,7 +469,7 @@
 		UPDATE course_schedule_teacher_salary csts left join course_schedule cs on csts.course_schedule_id_ = cs.id_ 
 		set
 			csts.subsidy_ = #{subsidy},
-		    csts.enable_change_salary_ = 0,
+		    csts.enable_change_salary_ = IF(teacher_role_='BISHOP', 0, 1),
 		    <if test="salary!=null">
 				csts.expect_salary_ = #{salary},
 			</if>