Merge remote-tracking branch 'origin/master'

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

@@ -126,9 +126,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			String organCode = organ.getKey();
 			String orgName = organ.getValue();
 
-//			SysUserTsign sysUserTsign = sysUserTsignService.queryByCardNo(organCode);
+			SysUserTsign sysUserTsign = sysUserTsignService.queryByCardNo(organCode);
 
-			/*if (sysUserTsign == null) {
+			if (sysUserTsign == null) {
 
 				String accountId = eSealPlugin.createOrganAccount(orgName, organCode);
 
@@ -146,7 +146,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 				sysUserTsignService.insert(sysUserTsign);
 
-			}*/
+			}
 		}
 	}
 

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

@@ -336,12 +336,6 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			dataList = courseScheduleStudentPaymentDao.findStudentByClassGroup(params);
 			//学生编号列表
 			List<Integer> userIds = dataList.stream().map(StudentAttendanceStatisticsResponse::getUserId).collect(Collectors.toList());
-			//学生-科目名称关联集合
-			List<Map<Integer, String>> byMusicGroupAndUsers = subjectDao.findByMusicGroupAndUsers(classGroup.getMusicGroupId(), userIds);
-			Map<Integer, String> userSubjectNameMap = MapUtil.convertMybatisMap(byMusicGroupAndUsers);
-			//学生-旷课次数关联集合
-			List<Map<Integer, Integer>> continuousAbsenteeismTimesByUsersAndMusicGroup = musicGroupStudentFeeDao.findContinuousAbsenteeismTimesByUsersAndMusicGroup(classGroup.getMusicGroupId(), userIds);
-			Map<Integer,Integer> continuousAbsenteeismTimesWithUser=MapUtil.convertIntegerMap(continuousAbsenteeismTimesByUsersAndMusicGroup);
 			//学生签到记录列表
 			List<StudentAttendanceResponse> studentAttendances = studentAttendanceDao.findByClassGroupAndUsers(queryInfo.getClassGroupId(), userIds);
 			//学生签到状态统计列表
@@ -353,25 +347,13 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 				Map<Integer, List<StudentAttendanceResponse>> studentAttendanceByUser = studentAttendances.stream().collect(Collectors.groupingBy(StudentAttendanceResponse::getUserId));
 
 				dataList.forEach(student->{
-					//判断是否是连续签到
-					Integer continuousAbsenteeismTimes = continuousAbsenteeismTimesWithUser.get(student.getUserId());
-					if(Objects.nonNull(continuousAbsenteeismTimes)){
-						if(continuousAbsenteeismTimes>=3){
-							student.setTruant(true);
-						}
-					}
-					//获取科目名
-					String userSubjectName = userSubjectNameMap.get(student.getSubjectName());
-					if(Objects.nonNull(userSubjectName)){
-						student.setSubjectName(userSubjectName);
-					}
 					//当前学生的签到状态统计
 					List<StudentAttendanceStatusCountDto> currentStudentAttendanceStatusCountDtos = studentAttendanceStatusCountDtosByUser.get(student.getUserId());
 					if(!CollectionUtils.isEmpty(currentStudentAttendanceStatusCountDtos)){
 						Map<StudentAttendanceStatusEnum, Integer> statusAndNumMap = currentStudentAttendanceStatusCountDtos.stream().collect(Collectors.toMap(StudentAttendanceStatusCountDto::getStatus, StudentAttendanceStatusCountDto::getNum));
 						student.setNormalDay(statusAndNumMap.get(StudentAttendanceStatusEnum.NORMAL));
-						student.setNormalDay(statusAndNumMap.get(StudentAttendanceStatusEnum.TRUANT));
-						student.setNormalDay(statusAndNumMap.get(StudentAttendanceStatusEnum.LEAVE));
+						student.setTruantDay(statusAndNumMap.get(StudentAttendanceStatusEnum.TRUANT));
+						student.setLeaveDay(statusAndNumMap.get(StudentAttendanceStatusEnum.LEAVE));
 					}
 
 					//当前学生签到记录

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

@@ -2466,7 +2466,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 		continue;
 					}
                     if(now.before(vipGroup.getRegistrationStartTime())){
-                        vipGroup.setStatus(VipGroupStatusEnum.NOT_START);
+                        if(vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)){
+							vipGroup.setStatus(VipGroupStatusEnum.NOT_START);
+						}
                     }
                     if(vipGroup.getRegistrationStartTime().before(now)&&vipGroup.getPaymentExpireDate().after(now)){
                         if(vipGroup.getStatus().equals(VipGroupStatusEnum.NOT_START)){

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

@@ -1233,28 +1233,30 @@
     
     <select id="queryTeacherCourseScheduleListByTimeRangeAndType" resultMap="CourseSchedule" parameterType="map">
         SELECT
-            id_,
-            class_group_id_,
-            status_,
-            subsidy_,
-            class_date_,
-            CONCAT(class_date_,' ',start_class_time_) start_class_time_,
-            CONCAT(class_date_,' ',end_class_time_) end_class_time_,
-            teacher_id_,
-            actual_teacher_id_,
-            create_time_,
-            update_time_,
-            teach_mode_,
-            type_,
-            name_,
-            student_num_,
-            leave_student_num_,
-            schoole_id_
-        FROM course_schedule WHERE teacher_id_=#{teacherId} and CONCAT( class_date_, ' ', start_class_time_ ) between #{startTime} and #{endTime}
+            cs.id_,
+            cs.class_group_id_,
+            cs.status_,
+            cs.subsidy_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.teacher_id_,
+            cs.actual_teacher_id_,
+            cs.create_time_,
+            cs.update_time_,
+            cs.teach_mode_,
+            cs.type_,
+            cg.name_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cs.schoole_id_
+        FROM course_schedule cs
+          LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
+        WHERE cs.teacher_id_=#{teacherId} and CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) between #{startTime} and #{endTime}
         <if test="type != null">
-          and type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+          and cs.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
-        ORDER BY CONCAT(class_date_,' ',start_class_time_)
+        ORDER BY CONCAT(cs.class_date_,' ',cs.start_class_time_)
     </select>
     <!-- 查找班级未开始的课程 -->
     <select id="findNoStartCoursesByClassGroupId" resultMap="CourseSchedule">

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

@@ -156,10 +156,9 @@
 			su.real_name_
 		FROM
 			course_schedule_student_payment cssp
-			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 			LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
 		WHERE
-			cs.class_group_id_ = #{classGroupId}
+			cssp.class_group_id_ = #{classGroupId}
 		GROUP BY
 			cssp.user_id_
 		ORDER BY cssp.user_id_
@@ -171,10 +170,8 @@
 			COUNT(DISTINCT cssp.user_id_)
 		FROM
 			course_schedule_student_payment cssp
-			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-			LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
 		WHERE
-			cs.class_group_id_ = #{classGroupId}
+			cssp.class_group_id_ = #{classGroupId}
 	</select>
     <select id="countSurplusCourseFee" resultType="java.math.BigDecimal">
 		SELECT

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

@@ -70,7 +70,12 @@ public class VipGroupManageController extends BaseController {
         if(Objects.isNull(teacher)){
             return failed("请指定指导老师!");
         }
-        vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(teacher.getTeacherOrganId());
+        Employee employee = employeeDao.get(sysUser.getId());
+        if(StringUtils.isEmpty(employee.getOrganIdList()) || employee.getOrganIdList().contains(",")){
+            vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(teacher.getTeacherOrganId());
+        }else {
+            vipGroupApplyDto.getVipGroupApplyBaseInfo().setOrganId(Integer.parseInt(employee.getOrganIdList()));
+        }
         vipGroupService.createVipGroup(vipGroupApplyDto);
         return succeed();
     }