Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

 Conflicts:

	cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -356,14 +356,17 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "用户注销")
 	@PostMapping(value = "/destroy")
-	public Object destroy() {
+	public Object destroy(String authCode) {
 		AuthUser user = SecurityUtils.getUser();
 		if (user != null) {
 			SysUser sysUser = sysUserService.get(user.getUserId());
-			sysUser.setPhone("Z" + sysUser.getPhone());
-			sysUser.setUpdateTime(new Date());
-			sysUserService.update(sysUser);
-			return succeed();
+			if(smsCodeService.verifyValidCode(sysUser.getPhone(), authCode)){
+				sysUser.setPhone("Z" + sysUser.getPhone());
+				sysUser.setUpdateTime(new Date());
+				sysUserService.update(sysUser);
+				return succeed();
+			}
+			return failed("验证码错误");
 		}
 		return failed("请登录");
 	}

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

@@ -226,14 +226,13 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 		}
 		
         CourseHomeworkStudentDetailDto courseHomeworkStudentDetail = studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
-        courseHomeworkStudentDetail.setExpire(DateUtil.isOverdue(courseHomeworkStudentDetail.getSubmitTime(),
-                sysConfigDao.findConfigValue("file_expiration_time")));
         if(courseHomeworkStudentDetail == null){
         	courseHomeworkStudentDetail = new CourseHomeworkStudentDetailDto();
 			courseHomeworkStudentDetail.setMusicGroupTrainPlan(musicGroupTrainPlan);
         	return courseHomeworkStudentDetail;
         }
-        
+        courseHomeworkStudentDetail.setExpire(DateUtil.isOverdue(courseHomeworkStudentDetail.getSubmitTime(),
+                sysConfigDao.findConfigValue("file_expiration_time")));
 		courseHomeworkStudentDetail.setMusicGroupTrainPlan(musicGroupTrainPlan);
         
         SysUser sysUser = teacherDao.getUser(userId.intValue());

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

@@ -926,8 +926,8 @@
             ifnull(sees.actual_exercises_num_,0) as actual_exercises_num_,
             ifnull(sees.exercises_reply_num_,0) as exercises_reply_num_,
             ifnull(sees.exercises_message_num_,0) as exercises_message_num_,
-            ifnull(a.sign_rate_,0) as sign_rate_,
-            ifnull(a.pass_rate_,0) as pass_rate_
+            round(ifnull(a.sign_rate_,0) * 100,2) as sign_rate_,
+            round(ifnull(a.pass_rate_,0) * 100,2) as pass_rate_
         from (
             select
                 a.user_id_ as student_id_,
@@ -976,8 +976,8 @@
         left join (
             select
                 cssp.user_id_,
-                ifnull(sum(if(sa.status_ = 'NORMAL',1,0))/count(sa.id_),0) as sign_rate_,
-                ifnull(sum(sa.qualified_flag_)/count(sa.id_),0) as pass_rate_
+                ifnull(sum(if(sa.status_ in ('NORMAL','LATE'),1,0))/count(cs.id_),0) as sign_rate_,
+                ifnull(sum(sa.qualified_flag_)/count(cs.id_),0) as pass_rate_
             from course_schedule cs
             left join course_schedule_student_payment cssp on cs.id_ = cssp.course_schedule_id_
             left join sys_user u ON cssp.user_id_ = u.id_
@@ -990,10 +990,10 @@
                     AND cs.tenant_id_ = #{params.tenantId}
                 </if>
                 <if test="params.startTime != null and params.startTime != ''">
-                    AND DATE_FORMAT(cs.start_class_time_, '%Y-%m-%d') &gt;= #{params.startTime}
+                    AND DATE_FORMAT(cs.class_date_, '%Y-%m-%d') &gt;= #{params.startTime}
                 </if>
                 <if test="params.endTime != null and params.endTime != ''">
-                    AND DATE_FORMAT(cs.end_class_time_, '%Y-%m-%d') &lt;= #{params.endTime}
+                    AND DATE_FORMAT(cs.class_date_, '%Y-%m-%d') &lt;= #{params.endTime}
                 </if>
                 <if test="params.organId != null and params.organId != ''">
                     AND FIND_IN_SET(u.organ_id_,#{params.organId})

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -1,16 +1,16 @@
 package com.ym.mec.thirdparty.storage.provider;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
+import com.aliyun.oss.ClientConfiguration;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.OSSObject;
 import com.ksyun.ks3.dto.PostObjectFormFields;
 import com.ksyun.ks3.service.Ks3;
 import com.ksyun.ks3.service.Ks3Client;
 import com.ksyun.ks3.service.Ks3ClientConfig;
 import com.ym.mec.thirdparty.entity.UploadSign;
-import com.ym.mec.thirdparty.threadLocal.BucketContextHolder;
+import com.ym.mec.thirdparty.exception.ThirdpartyException;
+import com.ym.mec.thirdparty.storage.StoragePlugin;
+import com.ym.mec.thirdparty.storage.StoragePluginContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.util.IOUtils;
@@ -19,12 +19,10 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import com.aliyun.oss.ClientConfiguration;
-import com.aliyun.oss.OSSClient;
-import com.aliyun.oss.model.OSSObject;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.thirdparty.storage.StoragePlugin;
-import com.ym.mec.thirdparty.storage.StoragePluginContext;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean, DisposableBean {