Parcourir la source

1、添加教务老师字段
2、布置作业

Joburgess il y a 5 ans
Parent
commit
416653c783

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

@@ -140,6 +140,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
     private static List<String> applyDayTimes = new ArrayList<>();
 
+    private static final Set<Integer> ENABLE_APPLY_ORGANIDS = new HashSet<>(Arrays.asList(new Integer[]{1, 43, 47}));
+
     static {
         applyStartDay = DateUtil.stringToDate("2020-03-25 00:00:00");
         activityStartDate = DateUtil.stringToDate("2020-03-25 00:00:00");
@@ -216,16 +218,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Override
     public Map<String, Object> checkCanApplyFreePracticeGroup(Integer userId) {
         Map<String,Object> result=new HashMap<>();
-//        int recordNum = practiceLessonApplyDao.checkUserIsApply(userId);
-//        LocalDateTime now=LocalDateTime.now();
-//        if(recordNum>0){
-//            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-29 00:00:00", DateUtil.dateTimeFormatter);
-//            result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
-//        }else{
-//            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-22 20:00:00", DateUtil.dateTimeFormatter);
-//            result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
-//        }
-        result.put("canApply", 1);
         return result;
     }
 
@@ -765,7 +757,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         result.put("userDefaultSubjectIds", StringUtils.join(userDefaultSubjectIds.toArray(), ","));
         result.put("practiceApplyIntervalMinutes", practiceApplyIntervalTimeConfig.getParanValue(Integer.class));
         result.put("practiceCourseMinutes", practiceCourseMinutesConfig.getParanValue(Integer.class));
-        result.put("enableApply", applyTimes < 1 ? 1 : 0);
         return result;
     }