Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ExtraExerciseStudentsDto.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2020/3/26
@@ -18,6 +20,16 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
 
     private String content;
 
+    private java.util.Date expireDate;
+
+    public Date getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(Date expireDate) {
+        this.expireDate = expireDate;
+    }
+
     public String getTitle() {
         return title;
     }

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

@@ -69,6 +69,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		detail.setTeacherName(extraExerciseReply.getTeacherName());
 		detail.setStudentId(extraExerciseReply.getUserId());
 		detail.setStudentName(extraExerciseReply.getStudentName());
+		detail.setExpiryDate(extraExerciseReply.getExpireDate());
 		return detail;
 	}
 

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

@@ -2,10 +2,13 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ExtracurricularExercisesDao;
 import com.ym.mec.biz.dal.dao.ExtracurricularExercisesReplyDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
+import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
+import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
@@ -30,6 +33,10 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 	private ExtracurricularExercisesDao extracurricularExercisesDao;
 	@Autowired
 	private ExtracurricularExercisesReplyDao extracurricularExercisesReplyDao;
+	@Autowired
+	private SysMessageService sysMessageService;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Override
 	public BaseDAO<Long, ExtracurricularExercises> getDAO() {
@@ -55,7 +62,8 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 		exercises.setBatchNo(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
 		exercises.setExpectNum(studentIds.size());
 		extracurricularExercisesDao.insert(exercises);
-		List<ExtracurricularExercisesReply> studentExtraExerises=new ArrayList<>();
+		String dateStr = DateUtil.dateToString(DateUtil.addDays(new Date(), 1), "MM月dd日");
+		Teacher teacher = teacherDao.get(exercises.getTeacherId());
 		for (Integer studentId : studentIds) {
 			ExtracurricularExercisesReply studentExtraExercise=new ExtracurricularExercisesReply();
 			studentExtraExercise.setExtracurricularExercisesId(exercises.getId());
@@ -63,9 +71,17 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 			studentExtraExercise.setStatus(0);
 			studentExtraExercise.setIsReplied(0);
 			studentExtraExercise.setIsView(0);
-			studentExtraExerises.add(studentExtraExercise);
+			extracurricularExercisesReplyDao.insert(studentExtraExercise);
+
+//			Map<Integer, String> userMap = new HashMap<>();
+//			userMap.put(studentId, studentId.toString());
+//			String notifyUrl = "3?courseScheduleID=" + studentExtraExercise.getId() + "&studentCourseHomeworkId=" + studentExtraExercise.getId();
+//			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND,exercises.getTeacherId().toString(),
+//					new String[]{studentId.toString()},
+//					null,exercises.getTitle(), dateStr,exercises.getContent());
+//			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_REMIND,
+//					userMap, null, 0, notifyUrl, "STUDENT", teacher.getRealName(), exercises.getTitle(), dateStr);
 		}
-		extracurricularExercisesReplyDao.batchInsert(studentExtraExerises);
 	}
 
 	@Override

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

@@ -1639,6 +1639,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
         SysConfig practiceCourseSalaryConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_SALARY);
         Date now = new Date();
+        if(practiceGroup.getFirstCourseTime().after(practiceGroup.getSecondCourseTime())){
+            Date tmp=practiceGroup.getSecondCourseTime();
+            practiceGroup.setSecondCourseTime(practiceGroup.getFirstCourseTime());
+            practiceGroup.setFirstCourseTime(tmp);
+        }
         if (practiceGroup.getFirstCourseTime().before(activityStartDate)
                 || practiceGroup.getFirstCourseTime().after(activityEndDate)) {
             result.put("status", "APPLY_DATE_OVERFLOW");

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

@@ -25,6 +25,7 @@
 		<result column="teacher_name_" property="teacherName"/>
 		<result column="title_" property="title"/>
 		<result column="content_" property="content"/>
+		<result column="expire_date_" property="expireDate"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -120,6 +121,7 @@
 			eer.*,
 			ee.title_,
 			ee.content_,
+			ee.expire_date_,
 			ee.teacher_id_,
 			su.username_ student_name_
 		FROM