zouxuan 5 năm trước cách đây
mục cha
commit
857f57638e

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

@@ -233,7 +233,11 @@ public class RoomServiceImpl implements RoomService {
         String userId = user.getId().toString();
         String userId = user.getId().toString();
         Teacher teacher = teacherDao.get(user.getId());
         Teacher teacher = teacherDao.get(user.getId());
         if(teacher != null){
         if(teacher != null){
-            teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), SignStatusEnum.SIGN_OUT,true);
+            try {
+                teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), SignStatusEnum.SIGN_OUT,true);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
         }
         }
         
         
         CheckUtils.checkArgument(user != null, "user must't be null");
         CheckUtils.checkArgument(user != null, "user must't be null");

+ 2 - 1
mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -9,6 +9,7 @@ import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiImplicitParams;
@@ -48,7 +49,7 @@ public class MusicGroupRegisterController extends BaseController {
         if (hasReg != null) {
         if (hasReg != null) {
             return failed("该乐团您已报名");
             return failed("该乐团您已报名");
         }
         }
-        if (musicGroup.getApplyExpireDate().compareTo(date) <= 0) {
+        if (DateUtil.daysBetween(musicGroup.getApplyExpireDate(),date) > 0) {
             return failed("乐团已截止报名");
             return failed("乐团已截止报名");
         }
         }