Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ExtracurricularExercisesReplyDao.java

@@ -31,6 +31,15 @@ public interface ExtracurricularExercisesReplyDao extends BaseDAO<Long, Extracur
                                                              @Param("studentName") String studentName);
 
     /**
+     * @describe 根据课外作业获取对应的学生列表
+     * @author Joburgess
+     * @date 2020/3/26
+     * @param extraExerciseIds:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply>
+     */
+    List<ExtracurricularExercisesReply> findExtraExerciseStudentsByExtraExercises(@Param("extraExerciseIds") List<Long> extraExerciseIds);
+
+    /**
      * @describe 获取学生课外训练详情
      * @author Joburgess
      * @date 2020/3/26

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

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2020/3/26
@@ -18,6 +20,16 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
 
     private String content;
 
+    private java.util.Date expireDate;
+
+    public Date getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(Date expireDate) {
+        this.expireDate = expireDate;
+    }
+
     public String getTitle() {
         return title;
     }

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

@@ -42,7 +42,27 @@ public class ExtracurricularExercises {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	private int isReplied;
+
+	private int isSubmit;
+
+	public int getIsReplied() {
+		return isReplied;
+	}
+
+	public void setIsReplied(int isReplied) {
+		this.isReplied = isReplied;
+	}
+
+	public int getIsSubmit() {
+		return isSubmit;
+	}
+
+	public void setIsSubmit(int isSubmit) {
+		this.isSubmit = isSubmit;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

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

@@ -26,16 +26,16 @@ public class PracticeGroupQueryInfo extends QueryInfo {
 
     private Boolean hasEducationalTeacherId;
 
-    private Boolean firstOrRenew;
+    private Integer type;
 
     private boolean isExport = false;
 
-    public Boolean getFirstOrRenew() {
-        return firstOrRenew;
+    public Integer getType() {
+        return type;
     }
 
-    public void setFirstOrRenew(Boolean firstOrRenew) {
-        this.firstOrRenew = firstOrRenew;
+    public void setType(Integer type) {
+        this.type = type;
     }
 
     public Boolean getHasEducationalTeacherId() {

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

@@ -17,14 +17,14 @@ public class StudentCourseHomeworkReplyQueryInfo extends QueryInfo {
 
     private Integer userId;
 
-    private boolean isExtra;
+    private boolean extra;
 
     public boolean isExtra() {
-        return isExtra;
+        return extra;
     }
 
-    public void setIsExtra(boolean isExtra) {
-        isExtra = isExtra;
+    public void setExtra(boolean extra) {
+        this.extra = extra;
     }
 
     public Integer getUserId() {

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

@@ -69,6 +69,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		detail.setTeacherName(extraExerciseReply.getTeacherName());
 		detail.setStudentId(extraExerciseReply.getUserId());
 		detail.setStudentName(extraExerciseReply.getStudentName());
+		detail.setExpiryDate(extraExerciseReply.getExpireDate());
 		return detail;
 	}
 

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

@@ -2,13 +2,15 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ExtracurricularExercisesDao;
 import com.ym.mec.biz.dal.dao.ExtracurricularExercisesReplyDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
+import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
@@ -17,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -30,6 +33,10 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 	private ExtracurricularExercisesDao extracurricularExercisesDao;
 	@Autowired
 	private ExtracurricularExercisesReplyDao extracurricularExercisesReplyDao;
+	@Autowired
+	private SysMessageService sysMessageService;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Override
 	public BaseDAO<Long, ExtracurricularExercises> getDAO() {
@@ -55,7 +62,8 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 		exercises.setBatchNo(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
 		exercises.setExpectNum(studentIds.size());
 		extracurricularExercisesDao.insert(exercises);
-		List<ExtracurricularExercisesReply> studentExtraExerises=new ArrayList<>();
+		String dateStr = DateUtil.dateToString(DateUtil.addDays(new Date(), 1), "MM月dd日");
+		Teacher teacher = teacherDao.get(exercises.getTeacherId());
 		for (Integer studentId : studentIds) {
 			ExtracurricularExercisesReply studentExtraExercise=new ExtracurricularExercisesReply();
 			studentExtraExercise.setExtracurricularExercisesId(exercises.getId());
@@ -63,32 +71,58 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 			studentExtraExercise.setStatus(0);
 			studentExtraExercise.setIsReplied(0);
 			studentExtraExercise.setIsView(0);
-			studentExtraExerises.add(studentExtraExercise);
+			extracurricularExercisesReplyDao.insert(studentExtraExercise);
+
+//			Map<Integer, String> userMap = new HashMap<>();
+//			userMap.put(studentId, studentId.toString());
+//			String notifyUrl = "3?courseScheduleID=" + studentExtraExercise.getId() + "&studentCourseHomeworkId=" + studentExtraExercise.getId();
+//			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND,exercises.getTeacherId().toString(),
+//					new String[]{studentId.toString()},
+//					null,exercises.getTitle(), dateStr,exercises.getContent());
+//			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_REMIND,
+//					userMap, null, 0, notifyUrl, "STUDENT", teacher.getRealName(), exercises.getTitle(), dateStr);
 		}
-		extracurricularExercisesReplyDao.batchInsert(studentExtraExerises);
 	}
 
 	@Override
 	public List<Map<String, Object>> findExtraExercilses(ExtraExercilseQueryInfo queryInfo) {
-		PageInfo<ExtracurricularExercises> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
+		List<Map<String, Object>> result = new ArrayList<>();
 
 		List<ExtracurricularExercises> dataList = extracurricularExercisesDao.findExtraExercises(params);
-		Map<String, List<ExtracurricularExercises>> collect = dataList.stream().collect(Collectors.groupingBy(e -> DateUtil.dateToString(e.getCreateTime(), "yyyy-MM-dd")));
+		if(!CollectionUtils.isEmpty(dataList)){
+			List<Long> extraExerciseIds = dataList.stream().map(ExtracurricularExercises::getId).collect(Collectors.toList());
+			List<ExtracurricularExercisesReply> extraExerciseStudentsByExtraExercises = extracurricularExercisesReplyDao.findExtraExerciseStudentsByExtraExercises(extraExerciseIds);
+			Map<Long, List<ExtracurricularExercisesReply>> idStudentsMap = extraExerciseStudentsByExtraExercises.stream().collect(Collectors.groupingBy(ExtracurricularExercisesReply::getExtracurricularExercisesId));
+			for (ExtracurricularExercises extracurricularExercises : dataList) {
+				List<ExtracurricularExercisesReply> extracurricularExercisesReplies = idStudentsMap.get(extracurricularExercises.getId());
+				if(CollectionUtils.isEmpty(extracurricularExercisesReplies)){
+					continue;
+				}
+				long repliedNum = extracurricularExercisesReplies.stream().filter(e -> e.getIsReplied() == 0).count();
+				if(repliedNum<=0){
+					extracurricularExercises.setIsReplied(1);
+				}
+				long submitNum = extracurricularExercisesReplies.stream().filter(e -> e.getIsView() == 1).count();
+				if(submitNum>0){
+					extracurricularExercises.setIsSubmit(1);
+				}
+			}
 
-		List<Map<String, Object>> result = new ArrayList<>();
-		List<Date> dates=new ArrayList<>();
-		collect.keySet().forEach(ds-> dates.add(DateUtil.stringToDate(ds,"yyyy-MM-dd")));
-		dates.sort(Comparator.comparing(Date::getTime));
-		dates.sort(Comparator.reverseOrder());
-		for (Date date : dates) {
-			String key=DateUtil.dateToString(date, "yyyy-MM-dd");
-			Map<String, Object> r = new HashMap<>();
-			r.put("day", key);
-			collect.get(key).sort(Comparator.comparing(ExtracurricularExercises::getCreateTime).reversed());
-			r.put("list", collect.get(key));
-			result.add(r);
+			Map<String, List<ExtracurricularExercises>> collect = dataList.stream().collect(Collectors.groupingBy(e -> DateUtil.dateToString(e.getCreateTime(), "yyyy-MM-dd")));
+			List<Date> dates=new ArrayList<>();
+			collect.keySet().forEach(ds-> dates.add(DateUtil.stringToDate(ds,"yyyy-MM-dd")));
+			dates.sort(Comparator.comparing(Date::getTime));
+			dates.sort(Comparator.reverseOrder());
+			for (Date date : dates) {
+				String key=DateUtil.dateToString(date, "yyyy-MM-dd");
+				Map<String, Object> r = new HashMap<>();
+				r.put("day", key);
+				collect.get(key).sort(Comparator.comparing(ExtracurricularExercises::getCreateTime).reversed());
+				r.put("list", collect.get(key));
+				result.add(r);
+			}
 		}
 		return result;
 	}

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

@@ -1639,6 +1639,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
         SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
         Date now = new Date();
+        if(practiceGroup.getFirstCourseTime().after(practiceGroup.getSecondCourseTime())){
+            Date tmp=practiceGroup.getSecondCourseTime();
+            practiceGroup.setSecondCourseTime(practiceGroup.getFirstCourseTime());
+            practiceGroup.setFirstCourseTime(tmp);
+        }
         if (practiceGroup.getFirstCourseTime().before(activityStartDate)
                 || practiceGroup.getFirstCourseTime().after(activityEndDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");

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

@@ -119,7 +119,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 				// 是否满足条件
 				if (tenantEntryActivities.getSuitableUser() == SuitableUser.NEW) {
 					if (po.getStatus() == DealStatusEnum.ING) {
-						int i = 30 - DateUtil.minutesBetween(po.getCreateTime(), date);
+						int i = 35 - DateUtil.minutesBetween(po.getCreateTime(), date);
 						if(i <= 0){
 							throw new BizException("您的订单出现异常，请联系客服");
 						}

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

@@ -232,9 +232,9 @@
         SELECT cs.id_,cs.actual_teacher_id_ teacher_id ,cs.class_date_, pg.subject_id_,pg.organ_id_,pg.name_
         course_name_,su.real_name_
         teacher_name_,edsu.real_name_
-        edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_
-        student_review_,csr.hand_homework_,csr.course_review_,pg.student_id_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
-        csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.create_time_,csr.update_time_,sa.id_
+        edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_ student_review_,
+        csr.hand_homework_,csr.course_review_,pg.student_id_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
+        csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,sa.id_
         attendance_id_,sch.is_replied_ home_work_replied_
         FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_

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

@@ -101,7 +101,7 @@
 				teacher_id_=#{teacherId}
 			</if>
 			<if test="createTime!=null">
-				AND DATE_FORMAT(create_time_, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d')
+				AND DATE_FORMAT(create_time_, '%Y-%m') = DATE_FORMAT(#{createTime}, '%Y-%m')
 			</if>
 		</where>
 	</sql>

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

@@ -80,12 +80,16 @@
 	<sql id="StudentExtraCommentsQueryCondition">
 		<where>
 			<if test="studentCourseHomeworkId!=null">
-				extracurricular_exercises_reply_id_=#{studentCourseHomeworkId}
+				AND extracurricular_exercises_reply_id_=#{studentCourseHomeworkId}
+			</if>
+			<if test="userId!=null">
+				AND eer.user_id_=#{userId}
 			</if>
 		</where>
 	</sql>
 	<select id="countStudentExtraComments" resultType="int">
-		SELECT COUNT(id_) FROM extracurricular_exercises_message
+		SELECT COUNT(eem.id_) FROM extracurricular_exercises_message eem
+		LEFT JOIN extracurricular_exercises_reply eer ON eer.id_=eem.extracurricular_exercises_reply_id_
 		<include refid="StudentExtraCommentsQueryCondition"/>
 	</select>
 	<select id="findStudentExtraComments" resultMap="com.ym.mec.biz.dal.dao.StudentCourseHomeworkReplyDao.studentCourseHomeworkComment">
@@ -100,8 +104,9 @@
 		FROM
 			extracurricular_exercises_message eem
 		LEFT JOIN sys_user suc ON eem.user_id_=suc.id_
+		LEFT JOIN extracurricular_exercises_reply eer ON eer.id_=eem.extracurricular_exercises_reply_id_
 		<include refid="StudentExtraCommentsQueryCondition"/>
-		ORDER BY schr.id_ DESC
+		ORDER BY eem.id_ DESC
 		<include refid="global.limit"/>
 	</select>
 </mapper>

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

@@ -25,6 +25,7 @@
 		<result column="teacher_name_" property="teacherName"/>
 		<result column="title_" property="title"/>
 		<result column="content_" property="content"/>
+		<result column="expire_date_" property="expireDate"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -115,11 +116,20 @@
 			AND su.username_ LIKE CONCAT('%',#{studentName},'%')
 		</if>
 	</select>
+
+	<select id="findExtraExerciseStudentsByExtraExercises" resultMap="ExtracurricularExercisesReply">
+		SELECT * FROM extracurricular_exercises_reply WHERE extracurricular_exercises_id_ IN
+		<foreach collection="extraExerciseIds" item="extraExerciseId" open="(" close=")" separator=",">
+			#{extraExerciseId}
+		</foreach>
+	</select>
+
 	<select id="findExtraExerciseReply" resultMap="ExtraExerciseStudentsDto">
 		SELECT
 			eer.*,
 			ee.title_,
 			ee.content_,
+			ee.expire_date_,
 			ee.teacher_id_,
 			su.username_ student_name_
 		FROM
@@ -132,16 +142,16 @@
 
 	<sql id="queryStudentExtraExercisesCondition">
 		<where>
-			<if test="teacherId!=null">
-				user_id_=#{studentId}
+			<if test="studentId!=null">
+				AND eer.user_id_=#{studentId}
 			</if>
 			<if test="createTime!=null">
-				DATE_FORMAT(create_time_, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d')
+				AND DATE_FORMAT(eer.create_time_, '%Y-%m') = DATE_FORMAT(#{createTime}, '%Y-%m')
 			</if>
 		</where>
 	</sql>
 	<select id="countStudentExtraExercises" resultType="int">
-		SELECT COUNT(id_) FROM extracurricular_exercises_reply
+		SELECT COUNT(id_) FROM extracurricular_exercises_reply eer
 		<include refid="queryStudentExtraExercisesCondition"/>
 	</select>
 	<select id="findStudentExtraExercises" resultMap="ExtraExerciseStudentsDto">
@@ -149,7 +159,7 @@
 			eer.*,
 			ee.teacher_id_,
 			tea.real_name_ teacher_name_,
-			su.student_name_
+			su.username_ student_name_
 		FROM
 			extracurricular_exercises_reply eer
 			LEFT JOIN extracurricular_exercises ee ON ee.id_=eer.extracurricular_exercises_id_

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

@@ -247,12 +247,15 @@
             <if test="educationalTeacherId!=null">
                 AND pg.educational_teacher_id_=#{educationalTeacherId}
             </if>
-            <if test="firstOrRenew != null and firstOrRenew == true">
+            <if test="type != null and firstOrRenew == 1">
                 AND pg.be_renew_group_id_ IS NULL
             </if>
-            <if test="firstOrRenew != null and firstOrRenew == false">
+            <if test="type != null and firstOrRenew == 0">
                 AND pg.be_renew_group_id_ IS NOT NULL
             </if>
+            <if test="type != null and firstOrRenew == 2">
+                AND pg.buy_months_ IS NULL
+            </if>
         </where>
     </sql>
 

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -16,6 +16,7 @@ import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SignStatusEnum;
 import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
 import com.ym.mec.biz.service.StudentAttendanceService;
@@ -99,7 +100,8 @@ public class RoomServiceImpl implements RoomService {
 
         log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={}", roomId, userName, isAudience, isDisableCamera);
 
-        String userId = sysUserFeignService.queryUserInfo().getId().toString();
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        String userId = sysUser.getId().toString();
         Teacher teacher = teacherDao.get(Integer.parseInt(userId));
         CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
         try {
@@ -111,7 +113,11 @@ public class RoomServiceImpl implements RoomService {
         }catch (Exception e){
             e.printStackTrace();
         }
-        roomId = "DAYA" + roomId;
+        if(courseSchedule.getGroupType() == GroupType.COMM){
+            roomId = "I" + roomId;
+        }else {
+            roomId = "S" + roomId;
+        }
         String display = "";
         Date curTime = DateTimeUtils.currentUTC();
         List<Room> roomList = roomDao.findByRid(roomId);
@@ -252,12 +258,12 @@ public class RoomServiceImpl implements RoomService {
         SysUser user = sysUserFeignService.queryUserInfo();
         String userId = user.getId().toString();
         Teacher teacher = teacherDao.get(user.getId());
-        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
+        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
         try {
             if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
-                teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), SignStatusEnum.SIGN_OUT,true);
+                teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(1)),user.getId(), SignStatusEnum.SIGN_OUT,true);
             }else {
-                studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
+                studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(1)),user.getId(), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -1141,12 +1147,12 @@ public class RoomServiceImpl implements RoomService {
 //            SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
             SysUser sysUser = teacherDao.getUser(Integer.parseInt(userId));
             Teacher teacher = teacherDao.get(sysUser.getId());
-            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
+            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
             try {
                 if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
-                    teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
+                    teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(1)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
                 }else {
-                    studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
+                    studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(1)),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
                 }
             }catch (Exception e){
                 e.printStackTrace();
@@ -1246,4 +1252,4 @@ public class RoomServiceImpl implements RoomService {
         }
         return result;
     }
-}
+}

mec-student/src/main/java/com/ym/mec/student/controller/StudentCourseHomeworkController.java

@@ -83,12 +83,12 @@ public class StudentCourseHomeworkController extends BaseController {
 
     @ApiOperation(value = "获取学生作业界面详细信息-公用")
     @GetMapping(value = "/findCourseHomeworkStudentDetailPublic")
-    public Object findCourseHomeworkStudentDetailPublic(Long courseScheduleID, boolean isExtra) {
+    public Object findCourseHomeworkStudentDetailPublic(Long courseScheduleID, boolean extra) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        if(!isExtra){
+        if(!extra){
             return succeed(studentCourseHomeworkService.findCourseHomeworkStudentDetail(courseScheduleID,user.getId().longValue()));
         }else{
             return succeed(extracurricularExercisesReplyService.findStudentExtraExerciseDetail(courseScheduleID));

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseHomeworkController.java

@@ -58,8 +58,8 @@ public class CourseHomeworkController extends BaseController {
 
     @ApiOperation(value = "根据课程计划获取需要交作业的学生-公用")
     @GetMapping("/findCourseStudentsPublic")
-    public Object findCourseStudentsPublic(Long courseScheduleId,String userName, boolean isExtra){
-        if(!isExtra){
+    public Object findCourseStudentsPublic(Long courseScheduleId,String userName, boolean extra){
+        if(!extra){
             return succeed(studentCourseHomeworkService.findStudentCourseHomeworkByCourse(courseScheduleId,userName));
         }else{
             return succeed(extracurricularExercisesReplyService.findExtraExerciseStudents(courseScheduleId,userName));
@@ -85,12 +85,12 @@ public class CourseHomeworkController extends BaseController {
 
     @ApiOperation(value = "获取学生作业界面详细信息-公用")
     @GetMapping(value = "/findCourseHomeworkStudentDetailPublic")
-    public Object findCourseHomeworkStudentDetailPublic(Long courseScheduleID,Long userId, boolean isExtra){
+    public Object findCourseHomeworkStudentDetailPublic(Long courseScheduleID,Long userId, boolean extra){
         StudentCourseHomework studentCourseHomework1 = studentCourseHomeworkService.get(courseScheduleID);
         if(Objects.isNull(studentCourseHomework1)){
             return failed("作业不存在");
         }
-        if(!isExtra){
+        if(!extra){
             CourseHomeworkStudentDetailDto courseHomeworkStudentDetail = studentCourseHomeworkService.findCourseHomeworkStudentDetail(studentCourseHomework1.getCourseScheduleId(), userId);
             if(Objects.nonNull(courseHomeworkStudentDetail)){
                 StudentCourseHomework studentCourseHomework=new StudentCourseHomework();

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseHomeworkReplyController.java

@@ -73,7 +73,7 @@ public class TeacherCourseHomeworkReplyController extends BaseController {
     }
 
     @ApiOperation(value = "回复查询-公用")
-    @PostMapping("/queryPagePublic")
+    @GetMapping("/queryPagePublic")
     public Object queryPagePublic(StudentCourseHomeworkReplyQueryInfo queryInfo){
         if(!queryInfo.isExtra()){
             return succeed(studentCourseHomeworkReplyService.queryPage(queryInfo));

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -693,8 +693,8 @@ public class ExportController extends BaseController {
                 }
             }
 
-            String[] header = {"分部", "上课日期", "学生编号", "课程编号", "学员是否到课", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "是否提交作业", "是否回复作业", "教务老师", "教务评价"};
-            String[] body = {"organName", "classDateStr", "studentId", "id", "attendanceStr", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison", "handHomeworkStr", "homeWorkReplied", "eduTeacherName", "courseReview"};
+            String[] header = {"分部", "上课日期", "学生编号", "课程编号", "学员是否到课", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通","学员评分", "是否提交作业", "是否回复作业", "教务老师", "教务评价"};
+            String[] body = {"organName", "classDateStr", "studentId", "id", "attendanceStr", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "song", "memo", "createTimeStr", "hasLiaison","studentReview", "handHomeworkStr", "homeWorkReplied", "eduTeacherName", "courseReview"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");