工具类合并到util项目

.gitignore

@@ -10,3 +10,4 @@ bin
 /p2p-utils/.gitignore
 .idea
 *.iml
+test

mec-biz/src/main/java/com/ym/mec/biz/service/DemoGroupService.java

@@ -39,6 +39,11 @@ public interface DemoGroupService extends BaseService<Long, DemoGroup> {
      */
     DemoGroup getDemoGroupByTeacherId();
 
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/26
+     * 获取教师试听课安排
+     */
     PageInfo findTeacherDemoGroups(TeacherManageDemoGroupQueryInfo queryInfo);
 
 }

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

@@ -12,6 +12,7 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
 import com.ym.mec.common.utils.DateUtils;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -148,7 +149,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 		}else{
 			//根据时间段调整课时
-			List<Date> dates= DateUtils.getWeekDays(classDateAdjustDto.getAdjustStartTime(),classDateAdjustDto.getAdjustEndTime(),classDateAdjustDto.getWeekNum());
+			List<Date> dates= DateUtil.getWeekDays(classDateAdjustDto.getAdjustStartTime(),classDateAdjustDto.getAdjustEndTime(),classDateAdjustDto.getWeekNum());
 			List<CourseSchedule> coursesByDates = courseScheduleDao.findOverLapCoursesInDay(dates,classDateAdjustDto.getStartClassTime(),classDateAdjustDto.getEndClassTime());
 			//判断是否存在同时间上课的班级
 			if(null==coursesByDates||coursesByDates.size()<=0){

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

@@ -140,6 +140,9 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 		String organIdsString = StringUtils.join(hashSet, ",");
 		demoGroup.setOrganIdList(organIdsString);
 		demoGroupDao.update(demoGroup);
+
+		//删除临时课程计划
+		demoGroupCoursesPlanDao.delete(coursePlanId);
 	}
 
 	@Override

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

@@ -15,6 +15,7 @@ import com.ym.mec.biz.dal.enums.TransTypeEnum;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.utils.DateUtils;
+import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.string.IdWorker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -99,7 +100,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<String, StudentW
 			WithdrawInfoDto withdrawInfoDto = new WithdrawInfoDto();
 			StudentWithdraw studentWithdraw = studentWithdrawDao.getByUserId(data.getUserId().longValue());
 			withdrawInfoDto.setWithdrawId(studentWithdraw.getId());
-			withdrawInfoDto.setDateTime(DateUtils.date2ChineseDate(studentWithdraw.getCreateTime()));
+			withdrawInfoDto.setDateTime(DateUtil.date2ChineseDate(studentWithdraw.getCreateTime()));
 			withdrawInfoDto.setAmount(data.getAmount());
 			withdrawInfoDto.setBalance(data.getBalance());
 			withdrawInfoDto.setTransTypeName(TransTypeEnum.getDescriptionByCode(data.getTransType().getCode()));

mec-common/common-core/src/main/java/com/ym/mec/common/utils/DateUtils.java

@@ -1,52 +0,0 @@
-package com.ym.mec.common.utils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author Joburgess
- * @Date 2019/9/23
- */
-public class DateUtils {
-
-    private static final String CHINESE_DATA_FORMAT = "yyyy年MM月dd日 HH:mm:ss";
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/9/23
-     * 获取时间段内对应星期数的集合
-     */
-    public static List<Date> getWeekDays(Date startTime, Date endTime, int weekNum){
-        Calendar calendar = Calendar.getInstance();
-        List<Date> dates=new ArrayList<>();
-        for(Date x = startTime; x.compareTo(endTime) <= 0;){
-            calendar.setTime(x);
-            calendar.add(Calendar.DATE, 1);
-            x = calendar.getTime();
-            if(calendar.get(Calendar.DAY_OF_WEEK) == weekNum){
-                dates.add(x);
-            }
-        }
-        return dates;
-    }
-
-    /**
-     * 时间转换为中文格式
-     * @param date
-     * @return
-     */
-    public static String date2ChineseDate(Date date){
-        return new SimpleDateFormat(CHINESE_DATA_FORMAT).format(date);
-    }
-
-    public static void main(String[] args) throws ParseException {
-        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
-        List<Date> mondayCount = getWeekDays(simpleDateFormat.parse("2019-9-23"), simpleDateFormat.parse("2019-10-23"), Calendar.SUNDAY);
-        System.out.println(mondayCount.size());
-    }
-
-}

mec-util/src/main/java/com/ym/mec/util/date/DateUtil.java

@@ -3,11 +3,7 @@ package com.ym.mec.util.date;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
+import java.util.*;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -19,6 +15,9 @@ import org.apache.commons.lang.StringUtils;
  */
 public class DateUtil {
 
+
+	private static final String CHINESE_DATA_FORMAT = "yyyy年MM月dd日 HH:mm:ss";
+
 	public static final String DEFAULT_PATTERN = "yyyy-MM-dd";
 
 	/**
@@ -871,4 +870,34 @@ public class DateUtil {
 		// DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		System.out.println(daysBetween(df.parse("2017-07-20 10:07:42"), df.parse(df.format(new Date()))));
 	}
+
+	/**
+	 * 获取时间段内对应星期数的集合
+	 * @param startTime 开始时间
+	 * @param endTime 结束时间
+	 * @param weekNum 周几
+	 * @return
+	 */
+	public static List<Date> getWeekDays(Date startTime, Date endTime, int weekNum){
+		Calendar calendar = Calendar.getInstance();
+		List<Date> dates=new ArrayList<>();
+		for(Date x = startTime; x.compareTo(endTime) <= 0;){
+			calendar.setTime(x);
+			calendar.add(Calendar.DATE, 1);
+			x = calendar.getTime();
+			if(calendar.get(Calendar.DAY_OF_WEEK) == weekNum){
+				dates.add(x);
+			}
+		}
+		return dates;
+	}
+
+	/**
+	 * 时间转换为中文格式
+	 * @param date
+	 * @return
+	 */
+	public static String date2ChineseDate(Date date){
+		return new SimpleDateFormat(CHINESE_DATA_FORMAT).format(date);
+	}
 }