Selaa lähdekoodia

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

zouxuan 5 vuotta sitten
vanhempi
commit
673f9b1f38

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseGroupTeacherCardDto.java

@@ -37,8 +37,18 @@ public class CourseGroupTeacherCardDto {
 
     private String studentNames;
 
+    private Integer studentIsFull;
+
     private GroupStatusEnum groupStatus;
 
+    public Integer getStudentIsFull() {
+        return studentIsFull;
+    }
+
+    public void setStudentIsFull(Integer studentIsFull) {
+        this.studentIsFull = studentIsFull;
+    }
+
     public GroupStatusEnum getGroupStatus() {
         return groupStatus;
     }

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -49,6 +49,9 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     HOMEWORK_REMIND("HOMEWORK_REMIND", "作业提醒-网管课"),
     STUDENT_PUSH_CLASS_MESSAGE("STUDENT_PUSH_CLASS_MESSAGE", "班级消息"),
     COMM_NO_STUDENTS_PUSH("COMM_NO_STUDENTS_PUSH", "对外课程组无学生提醒"),
+    HOMEWORK_SUBMIT_PUSH("HOMEWORK_SUBMIT_PUSH", "学生提交作业提醒"),
+    HOMEWORK_STUDENT_REPLY_PUSH("HOMEWORK_STUDENT_REPLY_PUSH", "学生作业回复提醒"),
+    HOMEWORK_TEACHER_REPLY_PUSH("HOMEWORK_TEACHER_REPLY_PUSH", "教师回复作业提醒"),
 
     TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN("TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN", "乐团课新增安排"),
     TEACHER_SMS_VIP_COURSE_APPLY_RESULT("TEACHER_SMS_VIP_COURSE_APPLY_RESULT", "VIP课申请结果"),

+ 10 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/StudentCourseHomeworkService.java

@@ -11,6 +11,15 @@ import java.util.List;
 public interface StudentCourseHomeworkService extends BaseService<Long, StudentCourseHomework> {
 
     /**
+     * @describe 提交作业
+     * @author Joburgess
+     * @date 2020/3/19
+     * @param bean:
+     * @return void
+     */
+    void submitHomework(StudentCourseHomework bean);
+
+    /**
      * @Author: Joburgess
      * @Date: 2019/9/18
      * 获取学生作业界面详细信息
@@ -50,4 +59,4 @@ public interface StudentCourseHomeworkService extends BaseService<Long, StudentC
      * @return
      */
     PageInfo<StudentCourseHomework> findStudentCourseHomeworks(QueryInfo queryInfo);
-}
+}

+ 0 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseReviewServiceImpl.java

@@ -226,7 +226,6 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                         studentCourseHomework.setStatus(YesOrNoEnum.NO);
                         studentCourseHomework.setIsView(YesOrNoEnum.NO);
                         studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
-//                        studentCourseHomeworks.add(studentCourseHomework);
                         studentCourseHomeworkDao.insert(studentCourseHomework);
 
                         Map<Integer, String> userMap = new HashMap<>();
@@ -235,7 +234,6 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_REMIND,
                                 userMap, null, 0, notifyUrl, "STUDENT", teacher.getRealName(), courseSchedule.getName(), dateStr);
                     }
-//                    studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
                 }
             }
 

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CoursesGroupServiceImpl.java

@@ -277,6 +277,9 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
                 if(!CollectionUtils.isEmpty(groupStudents)){
                     List<String> userNames = groupStudents.stream().map(ClassGroupStudentMapper::getUserName).collect(Collectors.toList());
                     groupCard.setStudentNames(StringUtils.join(userNames,","));
+                    groupCard.setStudentIsFull(groupStudents.size()>=teacherCourseGroup.getMaxStudentNum()?1:0);
+                }else{
+                    groupCard.setStudentIsFull(3);
                 }
                 groupCards.add(groupCard);
             }

+ 29 - 5
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkReplyServiceImpl.java

@@ -1,25 +1,30 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.StudentCourseHomeworkReplyDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.StudentCourseHomeworkCommentDto;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.entity.StudentCourseHomeworkReply;
+import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.StudentCourseHomeworkReplyQueryInfo;
 import com.ym.mec.biz.service.StudentCourseHomeworkReplyService;
 import com.ym.mec.biz.service.StudentCourseHomeworkService;
+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;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 @Service
 public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long, StudentCourseHomeworkReply> implements StudentCourseHomeworkReplyService {
@@ -29,7 +34,11 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 	@Autowired
 	private StudentCourseHomeworkService studentCourseHomeworkService;
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	private CourseScheduleDao courseScheduleDao;
+	@Autowired
+	private TeacherDao teacherDao;
+	@Autowired
+	private SysMessageService sysMessageService;
 
 	@Override
 	public BaseDAO<Long, StudentCourseHomeworkReply> getDAO() {
@@ -43,6 +52,13 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		if(Objects.isNull(studentCourseHomework)){
 			throw new BizException("请指定需要回复的作业");
 		}
+		CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
+		Map<Integer, String> userMap = new HashMap<>();
+		userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
+		SysUser user = teacherDao.getUser(studentCourseHomework.getUserId());
+		String notifyUrl = "9?courseScheduleID=" + courseSchedule.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,
+				userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(),"yyyy年MM月dd日"), user.getUsername());
 		return super.insert(bean);
 	}
 
@@ -56,6 +72,14 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		studentCourseHomeworkService.updateReplyStatus(bean.getUserId(),
 				studentCourseHomework.getCourseHomeworkId(),
 				studentCourseHomework.getUserId());
+
+		CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
+		Map<Integer, String> userMap = new HashMap<>();
+		userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString());
+		SysUser user = teacherDao.get(courseSchedule.getTeacherId());
+		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId();
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
+				userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
 		super.insert(bean);
 	}
 

+ 151 - 144
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -2,10 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.CourseHomeworkDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
-import com.ym.mec.biz.dal.dao.CourseScheduleReviewDao;
-import com.ym.mec.biz.dal.dao.StudentCourseHomeworkDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
@@ -22,8 +19,10 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,144 +32,152 @@ import java.util.*;
 @Service
 public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, StudentCourseHomework> implements StudentCourseHomeworkService {
 
-	@Autowired
-	private StudentCourseHomeworkDao studentCourseHomeworkDao;
-	@Autowired
-	private CourseHomeworkService courseHomeworkService;
-	@Autowired
-	private CourseHomeworkDao courseHomeworkDao;
-	@Autowired
-	private CourseScheduleDao courseScheduleDao;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
-
-	@Autowired
-	private SysMessageService sysMessageService;
-	@Autowired
-	private CourseScheduleReviewDao courseScheduleReviewDao;
-
-	@Override
-	public BaseDAO<Long, StudentCourseHomework> getDAO() {
-		return studentCourseHomeworkDao;
-	}
-
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public long insert(StudentCourseHomework bean) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		bean.setUserId(user.getId());
-		bean.setStatus(YesOrNoEnum.YES);
-		long insert = super.insert(bean);
-
-		CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
-
-		CourseHomework courseHomework = new CourseHomework();
-		courseHomework.setId(bean.getCourseHomeworkId());
-		courseHomework.setGroupType(courseSchedule.getGroupType());
-		courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
-
-		courseHomeworkService.update(courseHomework);
-		return insert;
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(StudentCourseHomework bean) {
-		if(Objects.isNull(bean)||Objects.isNull(bean.getId())){
-			throw new BizException("作业不存在");
-		}
-		super.update(bean);
-		bean=studentCourseHomeworkDao.get(bean.getId());
-		CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
-
-		CourseHomework courseHomework = new CourseHomework();
-		courseHomework.setId(bean.getCourseHomeworkId());
-		courseHomework.setGroupType(courseSchedule.getGroupType());
-		courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
-
-		CourseHomework temp = courseHomeworkService.get(courseHomework.getId());
-		if(temp.getExpectNum().equals(courseHomework.getCompletedNum())){
-			CourseScheduleReview review = courseScheduleReviewDao.findByCourseScheduleAndStudent(bean.getCourseScheduleId(),bean.getUserId());
-			if(Objects.nonNull(review)){
-				review.setHandHomework(YesOrNoEnum.YES.getCode());
-			}
-			courseScheduleReviewDao.update(review);
-		}
-
-		return courseHomeworkService.update(courseHomework);
-	}
-
-	@Override
-	public CourseHomeworkStudentDetailDto findCourseHomeworkStudentDetail(Long courseScheduleID, Long userId) {
-		if(Objects.isNull(courseScheduleID)){
-			throw new BizException("作业不存在");
-		}
-		return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
-	}
-
-	@Override
-	public boolean updateReplyStatus(Integer teacherId, Long courseHomeworkId, Integer studentId) {
-		StudentCourseHomework byStudentAndCourseHomewok = studentCourseHomeworkDao.findByStudentAndCourseHomewok(courseHomeworkId, studentId);
-		if (Objects.isNull(byStudentAndCourseHomewok)) {
-			throw new BizException("作业记录不存在");
-		}
-		if (byStudentAndCourseHomewok.getIsReplied() == YesOrNoEnum.YES) {
-			return true;
-		}
-		CourseHomework byTeacherAndCourseHomewok = courseHomeworkDao.findByTeacherAndCourseHomewok(courseHomeworkId, teacherId);
-		if (Objects.nonNull(byTeacherAndCourseHomewok)) {
-			byStudentAndCourseHomewok.setIsReplied(YesOrNoEnum.YES);
-			studentCourseHomeworkDao.update(byStudentAndCourseHomewok);
-		}
-		return true;
-	}
-
-	@Override
-	public PageInfo<StudentCourseHomework> queryPage(QueryInfo queryInfo) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		CourseHomeworkQueryInfo courseHomeworkQueryInfo = (CourseHomeworkQueryInfo) queryInfo;
-		courseHomeworkQueryInfo.setUserId(Long.valueOf(user.getId()));
-		return super.queryPage(queryInfo);
-	}
-
-	@Override
-	public List<StudentCourseHomework> findStudentCourseHomeworkByCourse(Long courseSchedule, String userName) {
-		if (Objects.isNull(courseSchedule)) {
-			throw new BizException("请指定课程");
-		}
-		return studentCourseHomeworkDao.findByCourseSchedule(courseSchedule, userName);
-	}
-
-	@Override
-	public void homeworkRemind() {
-		List<StudentCourseHomework> list = studentCourseHomeworkDao.queryNotDoneHomeworkList();
-		StringBuffer sb;
-		for (StudentCourseHomework sch : list) {
-			sb = new StringBuffer("courseScheduleID=").append(sch.getCourseScheduleId()).append("&studentCourseHomeworkId=").append(sch.getId());
-			Map<Integer, String> receivers = new HashMap<Integer, String>(1);
-			receivers.put(sch.getUserId(), sch.getUserId() + "");
-			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_JOB_MESSAGE, receivers, null, 0, "3?" + sb,"STUDENT", sch.getCourseHomework()
-					.getMusicGroup().getName(), sch.getCourseHomework().getClassGroup().getName());
-		}
-	}
-
-	@Override
-	public PageInfo<StudentCourseHomework> findStudentCourseHomeworks(QueryInfo queryInfo) {
-		PageInfo<StudentCourseHomework> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
-		Map<String, Object> params = new HashMap<>();
-		MapUtil.populateMap(params, queryInfo);
-
-		List<StudentCourseHomework> dataList = null;
-		int count = studentCourseHomeworkDao.countStudentCourseHomeworks(params);
-		if (count > 0) {
-			pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
-			dataList = studentCourseHomeworkDao.findStudentCourseHomeworks(params);
-		}
-		if (count == 0) {
-			dataList = new ArrayList<>();
-		}
-		pageInfo.setRows(dataList);
-		return pageInfo;
-	}
+    @Autowired
+    private StudentCourseHomeworkDao studentCourseHomeworkDao;
+    @Autowired
+    private CourseHomeworkService courseHomeworkService;
+    @Autowired
+    private CourseHomeworkDao courseHomeworkDao;
+    @Autowired
+    private CourseScheduleDao courseScheduleDao;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private SysMessageService sysMessageService;
+    @Autowired
+    private CourseScheduleReviewDao courseScheduleReviewDao;
+    @Autowired
+    private TeacherDao teacherDao;
+
+    @Override
+    public BaseDAO<Long, StudentCourseHomework> getDAO() {
+        return studentCourseHomeworkDao;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public long insert(StudentCourseHomework bean) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        bean.setUserId(user.getId());
+        bean.setStatus(YesOrNoEnum.YES);
+        long insert = super.insert(bean);
+
+        CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
+
+        CourseHomework courseHomework = new CourseHomework();
+        courseHomework.setId(bean.getCourseHomeworkId());
+        courseHomework.setGroupType(courseSchedule.getGroupType());
+        courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
+
+        courseHomeworkService.update(courseHomework);
+        return insert;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void submitHomework(StudentCourseHomework bean) {
+        if (Objects.isNull(bean) || Objects.isNull(bean.getId())) {
+            throw new BizException("作业不存在");
+        }
+        super.update(bean);
+        bean = studentCourseHomeworkDao.get(bean.getId());
+        CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
+
+        CourseHomework courseHomework = new CourseHomework();
+        courseHomework.setId(bean.getCourseHomeworkId());
+        courseHomework.setGroupType(courseSchedule.getGroupType());
+        courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
+
+        CourseHomework temp = courseHomeworkService.get(courseHomework.getId());
+        if (temp.getExpectNum().equals(courseHomework.getCompletedNum())) {
+            CourseScheduleReview review = courseScheduleReviewDao.findByCourseScheduleAndStudent(bean.getCourseScheduleId(), bean.getUserId());
+            if (Objects.nonNull(review)) {
+                review.setHandHomework(YesOrNoEnum.YES.getCode());
+            }
+            courseScheduleReviewDao.update(review);
+        }
+
+        Map<Integer, String> userMap = new HashMap<>();
+        userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
+        SysUser user = teacherDao.getUser(bean.getUserId());
+        String notifyUrl = "9?courseScheduleID=" + courseSchedule.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId();
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,
+                userMap, null, 0, notifyUrl, "TEACHER", courseSchedule.getName(), DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日"), user.getUsername());
+        courseHomeworkService.update(courseHomework);
+    }
+
+    @Override
+    public CourseHomeworkStudentDetailDto findCourseHomeworkStudentDetail(Long courseScheduleID, Long userId) {
+        if (Objects.isNull(courseScheduleID)) {
+            throw new BizException("作业不存在");
+        }
+        return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
+    }
+
+    @Override
+    public boolean updateReplyStatus(Integer teacherId, Long courseHomeworkId, Integer studentId) {
+        StudentCourseHomework byStudentAndCourseHomewok = studentCourseHomeworkDao.findByStudentAndCourseHomewok(courseHomeworkId, studentId);
+        if (Objects.isNull(byStudentAndCourseHomewok)) {
+            throw new BizException("作业记录不存在");
+        }
+        if (byStudentAndCourseHomewok.getIsReplied() == YesOrNoEnum.YES) {
+            return true;
+        }
+        CourseHomework byTeacherAndCourseHomewok = courseHomeworkDao.findByTeacherAndCourseHomewok(courseHomeworkId, teacherId);
+        if (Objects.nonNull(byTeacherAndCourseHomewok)) {
+            byStudentAndCourseHomewok.setIsReplied(YesOrNoEnum.YES);
+            studentCourseHomeworkDao.update(byStudentAndCourseHomewok);
+        }
+        return true;
+    }
+
+    @Override
+    public PageInfo<StudentCourseHomework> queryPage(QueryInfo queryInfo) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        CourseHomeworkQueryInfo courseHomeworkQueryInfo = (CourseHomeworkQueryInfo) queryInfo;
+        courseHomeworkQueryInfo.setUserId(Long.valueOf(user.getId()));
+        return super.queryPage(queryInfo);
+    }
+
+    @Override
+    public List<StudentCourseHomework> findStudentCourseHomeworkByCourse(Long courseSchedule, String userName) {
+        if (Objects.isNull(courseSchedule)) {
+            throw new BizException("请指定课程");
+        }
+        return studentCourseHomeworkDao.findByCourseSchedule(courseSchedule, userName);
+    }
+
+    @Override
+    public void homeworkRemind() {
+        List<StudentCourseHomework> list = studentCourseHomeworkDao.queryNotDoneHomeworkList();
+        StringBuffer sb;
+        for (StudentCourseHomework sch : list) {
+            sb = new StringBuffer("courseScheduleID=").append(sch.getCourseScheduleId()).append("&studentCourseHomeworkId=").append(sch.getId());
+            Map<Integer, String> receivers = new HashMap<Integer, String>(1);
+            receivers.put(sch.getUserId(), sch.getUserId() + "");
+            sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_JOB_MESSAGE, receivers, null, 0, "3?" + sb, "STUDENT", sch.getCourseHomework()
+                    .getMusicGroup().getName(), sch.getCourseHomework().getClassGroup().getName());
+        }
+    }
+
+    @Override
+    public PageInfo<StudentCourseHomework> findStudentCourseHomeworks(QueryInfo queryInfo) {
+        PageInfo<StudentCourseHomework> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<StudentCourseHomework> dataList = null;
+        int count = studentCourseHomeworkDao.countStudentCourseHomeworks(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentCourseHomeworkDao.findStudentCourseHomeworks(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -258,7 +258,7 @@
 		course_schedule_teacher_salary csts
 		LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
 		WHERE
-		cs.id_ IN (935453,936237,941743,943852,943853,947057,947766,953975,956585,961473,963648,971399,971403,973618,973635,973636,973637,981583,982904,982907,983748,990941,992760,1000909,1001264,1005970,1007127,1007911,1013814,1013818,1014509,1014667,1014671,1014672,1026261,1052210,1247504,1263832)
+		cs.id_ IN (961473)
 		AND csts.settlement_time_ IS NULL
 		AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
 	</select>

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

@@ -44,7 +44,7 @@ public class StudentCourseHomeworkController extends BaseController {
         studentCourseHomework.setStatus(YesOrNoEnum.YES);
         studentCourseHomework.setId(studentCourseHomework.getCourseHomeworkId());
         studentCourseHomework.setCourseHomeworkId(null);
-        studentCourseHomeworkService.update(studentCourseHomework);
+        studentCourseHomeworkService.submitHomework(studentCourseHomework);
         return succeed();
     }
 

+ 16 - 0
mec-web/src/main/java/com/ym/mec/web/controller/TenantEntryActivitiesController.java

@@ -3,6 +3,8 @@ package com.ym.mec.web.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,4 +48,18 @@ public class TenantEntryActivitiesController extends BaseController {
 		return succeed();
 	}
 
+	@ApiOperation(value = "停用、启用")
+	@PostMapping("/updateDelFlag")
+	@PreAuthorize("@pcs.hasPermissions('tenantEntryActivities/updateDelFlag')")
+	public Object updateDelFlag(int id, boolean delFlag) {
+		TenantEntryActivities tenantEntryActivities = tenantEntryActivitiesService.get(id);
+		if (tenantEntryActivities == null) {
+			return failed("活动不存在");
+		}
+		tenantEntryActivities.setDelFlag(delFlag);
+		tenantEntryActivities.setUpdateTime(new Date());
+		tenantEntryActivitiesService.merge(tenantEntryActivities);
+		return succeed();
+	}
+
 }