瀏覽代碼

1、教务端课程交换
2、vip课退课费用及相关逻辑调整
3、补签到、签退

Joburgess 5 年之前
父節點
當前提交
9f2bc0c89a

+ 9 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentAttendanceDao.java

@@ -26,6 +26,15 @@ public interface StudentAttendanceDao extends BaseDAO<Long, StudentAttendance> {
     int batchUpdate(List<StudentAttendance> studentAttendances);
 
     /**
+     * @describe
+     * @author Joburgess
+     * @date 2020/1/19
+     * @param courseId:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.StudentAttendance>
+     */
+    List<StudentAttendance> findByCourseId(@Param("courseId") Integer courseId);
+
+    /**
      * @describe 根据课程删除对应的点名记录
      * @author Joburgess
      * @date 2019/10/21

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

@@ -232,6 +232,13 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			studentAttendance.setCourseScheduleId(courseSchedule.getId());
 		}
 		studentAttendanceDao.addStudentAttendances(studentAttendances);
+		List<StudentAttendance> allStudentAttendances = studentAttendanceDao.findByCourseId(studentAttendanceInfo.getCourseScheduleId());
+		Map<StudentAttendanceStatusEnum, List<StudentAttendance>> studentAttendanceGroupByStatus = allStudentAttendances.stream().collect(Collectors.groupingBy(StudentAttendance::getStatus));
+		Integer studentNum=studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.NORMAL)==null?0:studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.NORMAL).size();
+		Integer leaveStudentNum=studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.LEAVE)==null?0:studentAttendanceGroupByStatus.get(StudentAttendanceStatusEnum.LEAVE).size();
+		courseSchedule.setStudentNum(studentNum);
+		courseSchedule.setLeaveStudentNum(leaveStudentNum);
+		courseScheduleDao.update(courseSchedule);
 	}
 
 	@Override

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/StudentAttendanceMapper.xml

@@ -443,4 +443,7 @@
         FROM course_schedule_student_payment
         WHERE course_schedule_id_ = #{search}
     </select>
+    <select id="findByCourseId" resultMap="StudentAttendance">
+        SELECT * FROM student_attendance WHERE course_schedule_id_=#{courseId}
+    </select>
 </mapper>

+ 3 - 3
mec-web/src/main/resources/application.yml

@@ -33,9 +33,9 @@ spring:
 #    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
 #    username: dayaData
 #    password: dayaDataOnline2019
-    url: jdbc:mysql://127.0.0.1:3306/mec_local?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
-    password: tiger
+    url: jdbc:mysql://120.26.238.168:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: mec_dev
+    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver