Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -45,11 +45,11 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		String credentials = obtainParameter(request, SPRING_SECURITY_RESTFUL_VERIFY_CODE_KEY);
 		// 是否是租户
 		String isLessee = obtainParameter(request, IS_LESSEE);
-		
+
 		boolean isRegister = StringUtils.equals("1", isLessee) || StringUtils.equals("true", isLessee);
 
 		String clientId = request.getParameter(clientIdParameter).toUpperCase();
-		
+
 		if ("EDUCATION".equals(clientId)) {
 			clientId = "SYSTEM";
 		}

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

@@ -5129,48 +5129,48 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 	@Override
 	public List<CourseScheduleModifyLog> queryCourseAdjustDetail(Long courseScheduleId) {
-
 		//获取所有的更改记录
 		Map<String,Object> param = new HashMap(1);
 		param.put("courseScheduleId",courseScheduleId);
-		return courseScheduleModifyLogDao.findAll(param);
-//		if(scheduleModifyLogs == null || scheduleModifyLogs.size() == 0){
-//			return null;
-//		}
-//		List<CourseScheduleAuditDetailDto> courseSchedules = new ArrayList<>();
-//		for (int i = scheduleModifyLogs.size() - 1; i >= 0; i--) {
-//			CourseScheduleModifyLog modifyLog = scheduleModifyLogs.get(i);
-//			CourseScheduleAuditDetailDto detailDto = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
-//			detailDto.setOperatorId(modifyLog.getOperatorId());
-//			detailDto.setAuditTime(modifyLog.getCreateTime());
-//			courseSchedules.add(detailDto);
-//			if(i == 0){
-//				//如果是第一次调整
-//				CourseScheduleAuditDetailDto dto = JSON.parseObject(modifyLog.getPreviousCourseSchedule(), CourseScheduleAuditDetailDto.class);
-//				dto.setOperatorId(modifyLog.getOperatorId());
-//				dto.setAuditTime(modifyLog.getCreateTime());
-//				courseSchedules.add(dto);
-//			}
-//		}
-//		if(courseSchedules.size() > 0){
-//			Set<Integer> actualTeacherIds = courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
-//			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getTeacherId()).collect(Collectors.toSet()));
-//			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet()));
-//			Set<Integer> schoolIds = courseSchedules.stream().map(e -> e.getSchoolId()).collect(Collectors.toSet());
-//			Map<Integer, String> actualTeacherMap = getMap("sys_user", "id_", "real_name_", actualTeacherIds, Integer.class, String.class);
-//			Map<Integer, String> schoolMap = new HashMap<>();
-//			if(schoolIds != null && schoolIds.size() > 0){
-//				schoolMap = getMap("school", "id_", "name_", schoolIds, Integer.class, String.class);
-//			}
-//			for (CourseScheduleAuditDetailDto e : courseSchedules) {
-//				e.setTeacherName(actualTeacherMap.get(e.getTeacherId()));
-//				e.setActualTeacherName(actualTeacherMap.get(e.getActualTeacherId()));
-//				e.setSchoolName(schoolMap.get(e.getSchoolId()));
-//				e.setOperatorName(actualTeacherMap.get(e.getOperatorId()));
-//			}
-//			return courseSchedules;
-//		}
-//		return null;
+		List<CourseScheduleModifyLog> scheduleModifyLogs = courseScheduleModifyLogDao.findAll(param);
+		List<CourseScheduleAuditDetailDto> courseSchedules = new ArrayList<>();
+		for (int i = scheduleModifyLogs.size() - 1; i >= 0; i--) {
+			CourseScheduleModifyLog modifyLog = scheduleModifyLogs.get(i);
+			CourseScheduleAuditDetailDto auditDetailDto = JSON.parseObject(modifyLog.getPreviousCourseSchedule(), CourseScheduleAuditDetailDto.class);
+			auditDetailDto.setOperatorId(modifyLog.getOperatorId());
+			courseSchedules.add(auditDetailDto);
+			CourseScheduleAuditDetailDto auditDetailDto1 = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
+			auditDetailDto1.setOperatorId(modifyLog.getOperatorId());
+			courseSchedules.add(auditDetailDto1);
+		}
+		if(courseSchedules.size() > 0){
+			Set<Integer> actualTeacherIds = courseSchedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toSet());
+			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getTeacherId()).collect(Collectors.toSet()));
+			actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet()));
+			Set<Integer> schoolIds = courseSchedules.stream().map(e -> e.getSchoolId()).collect(Collectors.toSet());
+			Map<Integer, String> actualTeacherMap = getMap("sys_user", "id_", "real_name_", actualTeacherIds, Integer.class, String.class);
+			Map<Integer, String> schoolMap = new HashMap<>();
+			if(schoolIds != null && schoolIds.size() > 0){
+				schoolMap = getMap("school", "id_", "name_", schoolIds, Integer.class, String.class);
+			}
+			for (CourseScheduleModifyLog modifyLog : scheduleModifyLogs) {
+				CourseScheduleAuditDetailDto preAuditDetailDto = JSON.parseObject(modifyLog.getPreviousCourseSchedule(), CourseScheduleAuditDetailDto.class);
+				preAuditDetailDto.setTeacherName(actualTeacherMap.get(preAuditDetailDto.getTeacherId()));
+				preAuditDetailDto.setActualTeacherName(actualTeacherMap.get(preAuditDetailDto.getActualTeacherId()));
+				preAuditDetailDto.setSchoolName(schoolMap.get(preAuditDetailDto.getSchoolId()));
+				preAuditDetailDto.setOperatorName(actualTeacherMap.get(preAuditDetailDto.getOperatorId()));
+				modifyLog.setPreviousCourseSchedule(JSONObject.toJSONString(preAuditDetailDto));
+
+				CourseScheduleAuditDetailDto auditDetailDto = JSON.parseObject(modifyLog.getCurrentCourseSchedule(), CourseScheduleAuditDetailDto.class);
+				auditDetailDto.setTeacherName(actualTeacherMap.get(auditDetailDto.getTeacherId()));
+				auditDetailDto.setActualTeacherName(actualTeacherMap.get(auditDetailDto.getActualTeacherId()));
+				auditDetailDto.setSchoolName(schoolMap.get(auditDetailDto.getSchoolId()));
+				auditDetailDto.setOperatorName(actualTeacherMap.get(auditDetailDto.getOperatorId()));
+				modifyLog.setCurrentCourseSchedule(JSONObject.toJSONString(auditDetailDto));
+			}
+			return scheduleModifyLogs;
+		}
+		return null;
 	}
 
 	@Override

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

@@ -20,7 +20,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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 com.alibaba.fastjson.JSONObject;
@@ -46,6 +45,7 @@ import com.ym.mec.im.ImFeignService;
 import com.ym.mec.thirdparty.eseal.ESealPlugin;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
 import org.springframework.transaction.annotation.Isolation;
 

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

@@ -142,7 +142,13 @@
         cs.name_,
         cs.student_num_,
         cs.leave_student_num_,
-        cs.schoole_id_
+        cs.schoole_id_,
+        cs.del_flag_,
+        cs.is_lock_,
+        cs.teaching_content_,
+        cs.note_,
+        cs.organ_id_,
+        cs.new_course_id_
     </sql>
 
     <!-- 根据主键查询一条记录 -->