1、课酬确认相关

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherSalaryModifyLogDao.java

@@ -0,0 +1,7 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface TeacherSalaryModifyLogDao extends BaseDAO<Long, TeacherSalaryModifyLog> {
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleReview.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -124,6 +125,16 @@ public class CourseScheduleReview {
     @ApiModelProperty(value = "教务老师名字",required = false)
     private String eduTeacherName;
 
+    private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
+
+    public ImSendTypeEnum getMsgType() {
+        return msgType;
+    }
+
+    public void setMsgType(ImSendTypeEnum msgType) {
+        this.msgType = msgType;
+    }
+
     public Integer getId() {
         return id;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercises.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.entity.SysUser;
@@ -55,6 +56,16 @@ public class ExtracurricularExercises {
 	
 	private String organName;
 
+	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
+
+	public ImSendTypeEnum getMsgType() {
+		return msgType;
+	}
+
+	public void setMsgType(ImSendTypeEnum msgType) {
+		this.msgType = msgType;
+	}
+
 	public int getStatus() {
 		return status;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseHomework.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -51,6 +52,16 @@ public class StudentCourseHomework {
 
 	private Date submitTime;
 
+	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
+
+	public ImSendTypeEnum getMsgType() {
+		return msgType;
+	}
+
+	public void setMsgType(ImSendTypeEnum msgType) {
+		this.msgType = msgType;
+	}
+
 	public Date getSubmitTime() {
 		return submitTime;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherSalaryModifyLog.java

@@ -0,0 +1,106 @@
+package com.ym.mec.biz.dal.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TeacherSalaryModifyLog {
+	private Long id;
+
+	private Integer teacherId;
+
+	private Long courseScheduleId;
+
+	private BigDecimal preExpectSalary;
+
+	private BigDecimal preReduceSalary;
+
+	private BigDecimal currentExpectSalary;
+
+	private BigDecimal currentReduceSalary;
+
+	private String memo;
+
+	private Integer operatorId;
+
+	private Date createTime;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getTeacherId() {
+		return teacherId;
+	}
+
+	public void setTeacherId(Integer teacherId) {
+		this.teacherId = teacherId;
+	}
+
+	public Long getCourseScheduleId() {
+		return courseScheduleId;
+	}
+
+	public void setCourseScheduleId(Long courseScheduleId) {
+		this.courseScheduleId = courseScheduleId;
+	}
+
+	public BigDecimal getPreExpectSalary() {
+		return preExpectSalary;
+	}
+
+	public void setPreExpectSalary(BigDecimal preExpectSalary) {
+		this.preExpectSalary = preExpectSalary;
+	}
+
+	public BigDecimal getPreReduceSalary() {
+		return preReduceSalary;
+	}
+
+	public void setPreReduceSalary(BigDecimal preReduceSalary) {
+		this.preReduceSalary = preReduceSalary;
+	}
+
+	public BigDecimal getCurrentExpectSalary() {
+		return currentExpectSalary;
+	}
+
+	public void setCurrentExpectSalary(BigDecimal currentExpectSalary) {
+		this.currentExpectSalary = currentExpectSalary;
+	}
+
+	public BigDecimal getCurrentReduceSalary() {
+		return currentReduceSalary;
+	}
+
+	public void setCurrentReduceSalary(BigDecimal currentReduceSalary) {
+		this.currentReduceSalary = currentReduceSalary;
+	}
+
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
+	public Integer getOperatorId() {
+		return operatorId;
+	}
+
+	public void setOperatorId(Integer operatorId) {
+		this.operatorId = operatorId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+}

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

@@ -48,6 +48,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     STUDENT_PUSH_JOB_MESSAGE("STUDENT_PUSH_JOB_MESSAGE", "作业提醒"),
     HOMEWORK_REMIND("HOMEWORK_REMIND", "作业提醒-网管课"),
     IM_HOMEWORK_REMIND("IM_HOMEWORK_REMIND", "作业提醒"),
+    IM_HOMEWORK_REMIND_DETAIL("IM_HOMEWORK_REMIND_DETAIL", "作业提醒"),
     IM_HOMEWORK_SUBMIT_PUSH("IM_HOMEWORK_SUBMIT_PUSH", "作业提交提醒"),
     IM_HOMEWORK_STUDENT_REPLY_PUSH("IM_HOMEWORK_STUDENT_REPLY_PUSH", "作业回复提醒"),
     IM_HOMEWORK_TEACHER_REPLY_PUSH("IM_HOMEWORK_TEACHER_REPLY_PUSH", "作业点评提醒"),
@@ -60,6 +61,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     /** 课外训练消息 */
     EXTRA_REMIND_PUSH("EXTRA_REMIND_PUSH", "作业提醒"),
     EXTRA_REMIND_IM("EXTRA_REMIND_IM", "作业提醒"),
+    EXTRA_REMIND_IM_DETAIL("EXTRA_REMIND_IM_DETAIL", "作业提醒"),
     EXTRA_TEACHER_REPLY_PUSH("EXTRA_TEACHER_REPLY_PUSH", "作业点评提醒"),
     EXTRA_TEACHER_REPLY_IM("EXTRA_TEACHER_REPLY_IM", "作业点评提醒"),
     EXTRA_SUBMIT_PUSH("EXTRA_SUBMIT_PUSH", "作业提交提醒"),

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

@@ -0,0 +1,7 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog;
+import com.ym.mec.common.service.BaseService;
+
+public interface TeacherSalaryModifyLogService extends BaseService<Long, TeacherSalaryModifyLog> {
+}

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

@@ -12,6 +12,7 @@ import java.util.stream.Collectors;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.common.entity.ImPrivateMessage;
 import com.ym.mec.common.entity.ImTxtMessage;
 import com.ym.mec.im.ImFeignService;
@@ -239,12 +240,19 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
 
                     Map<Integer, String> userMap = new HashMap<>();
                     userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());
-                    String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
-                    sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND,courseScheduleReview.getTeacherId().toString(),null,
-                                                    new String[]{courseScheduleStudentPayment.getUserId().toString()},
-                                                    null,courseSchedule.getName(), dateStr,courseHomework.getContent());
+                    String notifyUrl = "?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+                    String extra = "dayaedu" + notifyUrl + "&userId=" + courseScheduleStudentPayment.getUserId();
+                    if (courseScheduleReview.getMsgType() != ImSendTypeEnum.TXT){
+                        sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND_DETAIL,courseScheduleReview.getTeacherId().toString(),extra,
+                                new String[]{courseScheduleStudentPayment.getUserId().toString()},
+                                null,courseSchedule.getName(), dateStr,courseHomework.getContent());
+                    }else {
+                        sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND,courseScheduleReview.getTeacherId().toString(),extra,
+                                new String[]{courseScheduleStudentPayment.getUserId().toString()},
+                                null,courseSchedule.getName(), dateStr,courseHomework.getContent());
+                    }
                     sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_REMIND,
-                            userMap, null, 0, notifyUrl, "STUDENT", teacher.getRealName(), courseSchedule.getName(), dateStr);
+                            userMap, null, 0, 3+notifyUrl, "STUDENT", teacher.getRealName(), courseSchedule.getName(), dateStr);
                 }
             }
         }

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

@@ -84,10 +84,9 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 
 			Map<Integer, String> userMap = new HashMap<>();
 			userMap.put(extracurricularExercisesReply.getUserId(),extracurricularExercisesReply.getUserId().toString());
-			String notifyUrl = "3?courseScheduleID=" + extracurricularExercisesReply.getId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
-			String extra = "";
+			String notifyUrl = "?courseScheduleID=" + extracurricularExercisesReply.getId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
+			String extra = "dayaedu" + notifyUrl + "&userId=" + extracurricularExercisesReply.getUserId();
 			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT){
-				extra = "dayaedu?courseScheduleID=" + extracurricularExercisesReply.getId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1&" + "userId=" + extracurricularExercisesReply.getUserId();
 				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_TEACHER_REPLY_IM,extracurricularExercises.getTeacherId().toString(),extra,
 						new String[]{extracurricularExercisesReply.getUserId().toString()},
 						null, extracurricularExercises.getTitle(), SysConfigService.NEW_MSG_PUSH);
@@ -97,27 +96,25 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 						null, extracurricularExercises.getTitle(), extracurricularExercisesMessage.getContent());
 			}
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_TEACHER_REPLY_PUSH,
-					userMap, null, 0, notifyUrl, "STUDENT", extracurricularExercises.getTitle());
+					userMap, null, 0, 3+notifyUrl, "STUDENT", extracurricularExercises.getTitle());
 		}else if("STUDENT".equals(extracurricularExercisesMessage.getRole())&&Objects.nonNull(extracurricularExercisesReply.getAttachments())){
 			Map<Integer, String> userMap = new HashMap<>();
 			userMap.put(extracurricularExercises.getTeacherId(), extracurricularExercises.getTeacherId().toString());
 			SysUser user = teacherDao.getUser(extracurricularExercisesReply.getUserId());
 
-			String notifyUrl = "9?courseScheduleID=" + extracurricularExercisesReply.getId() +
+			String notifyUrl = "?courseScheduleID=" + extracurricularExercisesReply.getId() +
 					"&userId=" + extracurricularExercisesReply.getUserId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
-			String extra = "";
 			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT){
-				extra = "dayaedu?courseScheduleID=" + extracurricularExercisesReply.getId() + "&userId=" + extracurricularExercisesReply.getUserId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
-				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),extra,
+				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),"dayaedu"+notifyUrl,
 						new String[]{extracurricularExercises.getTeacherId().toString()},
 						null,extracurricularExercises.getTitle(), SysConfigService.NEW_MSG_PUSH);
 			}else {
-				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),extra,
+				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),"dayaedu"+notifyUrl,
 						new String[]{extracurricularExercises.getTeacherId().toString()},
 						null,extracurricularExercises.getTitle(), extracurricularExercisesMessage.getContent());
 			}
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_STUDENT_REPLY_PUSH,
-					userMap, null, 0, notifyUrl, "TEACHER", extracurricularExercises.getTitle(), user.getUsername());
+					userMap, null, 0, 9+notifyUrl, "TEACHER", extracurricularExercises.getTitle(), user.getUsername());
 		}
 	}
 

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

@@ -148,12 +148,12 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			Map<Integer, String> userMap = new HashMap<>();
 			userMap.put(extracurricularExercises.getTeacherId(), extracurricularExercises.getTeacherId().toString());
 			SysUser user = teacherDao.getUser(existExtra.getUserId());
-			String notifyUrl = "9?courseScheduleID=" + existExtra.getId() + "&userId=" + existExtra.getUserId() + "&studentCourseHomeworkId=" + existExtra.getId()+ "&extra=1";
-			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_SUBMIT_IM,existExtra.getUserId().toString(),null,
+			String notifyUrl = "?courseScheduleID=" + existExtra.getId() + "&userId=" + existExtra.getUserId() + "&studentCourseHomeworkId=" + existExtra.getId()+ "&extra=1";
+			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_SUBMIT_IM,existExtra.getUserId().toString(),"dayaedu"+notifyUrl,
 					new String[]{extracurricularExercises.getTeacherId().toString()},
 					null,extracurricularExercises.getTitle());
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_SUBMIT_PUSH,
-					userMap, null, 0, notifyUrl, "TEACHER",
+					userMap, null, 0, 9+notifyUrl, "TEACHER",
 					extracurricularExercises.getTitle(), user.getUsername());
 		}
 	}

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

@@ -6,6 +6,7 @@ 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.enums.ImSendTypeEnum;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
@@ -78,15 +79,21 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 			studentExtraExercise.setIsRepliedTimely(0);
 			extracurricularExercisesReplyDao.insert(studentExtraExercise);
 
-			String notifyUrl = "3?courseScheduleID=" + studentExtraExercise.getId() + "&studentCourseHomeworkId=" + studentExtraExercise.getId() + "&extra=1";
-			sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_REMIND_IM,exercises.getTeacherId().toString(),null,
-					new String[]{studentId.toString()},
-					null, exercises.getTitle(), dateStr,exercises.getContent());
-
+			String notifyUrl = "?courseScheduleID=" + studentExtraExercise.getId() + "&studentCourseHomeworkId=" + studentExtraExercise.getId() + "&extra=1";
+			String extra = "dayaedu" + notifyUrl + "&userId=" + studentId;
+			if (exercises.getMsgType() != ImSendTypeEnum.TXT){
+				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_REMIND_IM_DETAIL,exercises.getTeacherId().toString(),extra,
+						new String[]{studentId.toString()},
+						null, exercises.getTitle(), dateStr);
+			}else {
+				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_REMIND_IM,exercises.getTeacherId().toString(),extra,
+						new String[]{studentId.toString()},
+						null, exercises.getTitle(), dateStr,exercises.getContent());
+			}
 			Map<Integer, String> userMap = new HashMap<>();
 			userMap.put(studentId, studentId.toString());
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.EXTRA_REMIND_PUSH,
-					userMap, null, 0, notifyUrl, "STUDENT",
+					userMap, null, 0, 3+notifyUrl, "STUDENT",
 					teacher.getRealName(),exercises.getTitle(), dateStr);
 		}
 	}

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

@@ -32,130 +32,130 @@ import java.util.*;
 
 @Service
 public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long, StudentCourseHomeworkReply> implements StudentCourseHomeworkReplyService {
+	
+	@Autowired
+	private StudentCourseHomeworkReplyDao studentCourseHomeworkReplyDao;
+	@Autowired
+	private StudentCourseHomeworkService studentCourseHomeworkService;
+	@Autowired
+	private CourseScheduleDao courseScheduleDao;
+	@Autowired
+	private TeacherDao teacherDao;
+	@Autowired
+	private SysConfigDao sysConfigDao;
+	@Autowired
+	private SysMessageService sysMessageService;
 
-    @Autowired
-    private StudentCourseHomeworkReplyDao studentCourseHomeworkReplyDao;
-    @Autowired
-    private StudentCourseHomeworkService studentCourseHomeworkService;
-    @Autowired
-    private CourseScheduleDao courseScheduleDao;
-    @Autowired
-    private TeacherDao teacherDao;
-    @Autowired
-    private SysConfigDao sysConfigDao;
-    @Autowired
-    private SysMessageService sysMessageService;
+	@Override
+	public BaseDAO<Long, StudentCourseHomeworkReply> getDAO() {
+		return studentCourseHomeworkReplyDao;
+	}
 
-    @Override
-    public BaseDAO<Long, StudentCourseHomeworkReply> getDAO() {
-        return studentCourseHomeworkReplyDao;
-    }
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public long insert(StudentCourseHomeworkReply bean) {
+		StudentCourseHomework studentCourseHomework = studentCourseHomeworkService.get(bean.getStudentCourseHomeworkId());
+		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());
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public long insert(StudentCourseHomeworkReply bean) {
-        StudentCourseHomework studentCourseHomework = studentCourseHomeworkService.get(bean.getStudentCourseHomeworkId());
-        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=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+		String extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
+		if (bean.getMsgType() != ImSendTypeEnum.TXT){
+			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
+					new String[]{courseSchedule.getActualTeacherId().toString()},
+					null,courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
+		}else {
+			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
+					new String[]{courseSchedule.getActualTeacherId().toString()},
+					null,courseDate,courseSchedule.getName(),bean.getContent());
+		}
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,
+				userMap, null, 0, notifyUrl, "TEACHER", courseDate,courseSchedule.getName(), user.getUsername());
+		return super.insert(bean);
+	}
 
-        String notifyUrl = "9?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
-        String extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
-        String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-        if (bean.getMsgType() != ImSendTypeEnum.TXT){
-            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
-                    new String[]{courseSchedule.getActualTeacherId().toString()},
-                    null,courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
-        }else {
-            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
-                    new String[]{courseSchedule.getActualTeacherId().toString()},
-                    null,courseDate,courseSchedule.getName(),bean.getContent());
-        }
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_STUDENT_REPLY_PUSH,
-                userMap, null, 0, notifyUrl, "TEACHER", courseDate,courseSchedule.getName(), user.getUsername());
-        return super.insert(bean);
-    }
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void insertTeacherReply(StudentCourseHomeworkReply bean) {
+		StudentCourseHomework studentCourseHomework = studentCourseHomeworkService.get(bean.getStudentCourseHomeworkId());
+		if(Objects.isNull(studentCourseHomework)){
+			throw new BizException("请指定需要回复的作业");
+		}
+		if(Objects.nonNull(studentCourseHomework.getAttachments())){
+			studentCourseHomeworkService.updateReplyStatus(bean.getUserId(),
+					studentCourseHomework.getCourseHomeworkId(),
+					studentCourseHomework.getUserId());
+		}
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void insertTeacherReply(StudentCourseHomeworkReply bean) {
-        StudentCourseHomework studentCourseHomework = studentCourseHomeworkService.get(bean.getStudentCourseHomeworkId());
-        if(Objects.isNull(studentCourseHomework)){
-            throw new BizException("请指定需要回复的作业");
-        }
-        if(Objects.nonNull(studentCourseHomework.getAttachments())){
-            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.getActualTeacherId());
+		String notifyUrl = "?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
+		String extra = "dayaedu" + notifyUrl + "&userId=" + studentCourseHomework.getUserId();
+		if (bean.getMsgType() != ImSendTypeEnum.TXT){
+			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
+					new String[]{studentCourseHomework.getUserId().toString()},
+					null, courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
+		}else {
+			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
+					new String[]{studentCourseHomework.getUserId().toString()},
+					null, courseDate,courseSchedule.getName(),bean.getContent());
+		}
 
-        CourseSchedule courseSchedule = courseScheduleDao.get(studentCourseHomework.getCourseScheduleId());
-        Map<Integer, String> userMap = new HashMap<>();
-        userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString());
-        SysUser user = teacherDao.get(courseSchedule.getActualTeacherId());
-        String notifyUrl = "?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
-        String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-        String extra = "dayaedu" + notifyUrl + "&userId=" + studentCourseHomework.getUserId();
-        if (bean.getMsgType() != ImSendTypeEnum.TXT){
-            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
-                    new String[]{studentCourseHomework.getUserId().toString()},
-                    null, courseDate,courseSchedule.getName(),SysConfigService.NEW_MSG_PUSH);
-        }else {
-            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
-                    new String[]{studentCourseHomework.getUserId().toString()},
-                    null, courseDate,courseSchedule.getName(),bean.getContent());
-        }
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
+				userMap, null, 0, 3+notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
+		super.insert(bean);
+	}
 
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
-                userMap, null, 0, 3+notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
-        super.insert(bean);
-    }
+	@Override
+	public PageInfo queryPage(QueryInfo queryInfo) {
+		StudentCourseHomeworkReplyQueryInfo studentCourseHomeworkReplyQueryInfo= (StudentCourseHomeworkReplyQueryInfo) queryInfo;
+		studentCourseHomeworkReplyQueryInfo.setParentID(null);
+		PageInfo studentCourseHomeworkReplyPageInfo = super.queryPage(studentCourseHomeworkReplyQueryInfo);
+		for(Object temp:studentCourseHomeworkReplyPageInfo.getRows()){
+			studentCourseHomeworkReplyQueryInfo.setParentID(((StudentCourseHomeworkCommentDto)temp).getReplyId());
+			getTree((StudentCourseHomeworkCommentDto) temp,studentCourseHomeworkReplyQueryInfo);
+		}
+		return studentCourseHomeworkReplyPageInfo;
+	}
 
-    @Override
-    public PageInfo queryPage(QueryInfo queryInfo) {
-        StudentCourseHomeworkReplyQueryInfo studentCourseHomeworkReplyQueryInfo= (StudentCourseHomeworkReplyQueryInfo) queryInfo;
-        studentCourseHomeworkReplyQueryInfo.setParentID(null);
-        PageInfo studentCourseHomeworkReplyPageInfo = super.queryPage(studentCourseHomeworkReplyQueryInfo);
-        for(Object temp:studentCourseHomeworkReplyPageInfo.getRows()){
-            studentCourseHomeworkReplyQueryInfo.setParentID(((StudentCourseHomeworkCommentDto)temp).getReplyId());
-            getTree((StudentCourseHomeworkCommentDto) temp,studentCourseHomeworkReplyQueryInfo);
-        }
-        return studentCourseHomeworkReplyPageInfo;
-    }
+	@Override
+	public int delete(Long id) {
+		StudentCourseHomeworkReply studentCourseHomeworkReply = super.get(id);
+		List<Long> ids=new ArrayList<>();
+		ids.add(id);
+		List<StudentCourseHomeworkReply> allReplyByStudentCourseHomeworkID = studentCourseHomeworkReplyDao.findAllReplyByStudentCourseHomeworkID(studentCourseHomeworkReply.getStudentCourseHomeworkId());
+		findAllChildID(id,allReplyByStudentCourseHomeworkID,ids);
+		return studentCourseHomeworkReplyDao.batchDeleteReplys(ids);
+	}
 
-    @Override
-    public int delete(Long id) {
-        StudentCourseHomeworkReply studentCourseHomeworkReply = super.get(id);
-        List<Long> ids=new ArrayList<>();
-        ids.add(id);
-        List<StudentCourseHomeworkReply> allReplyByStudentCourseHomeworkID = studentCourseHomeworkReplyDao.findAllReplyByStudentCourseHomeworkID(studentCourseHomeworkReply.getStudentCourseHomeworkId());
-        findAllChildID(id,allReplyByStudentCourseHomeworkID,ids);
-        return studentCourseHomeworkReplyDao.batchDeleteReplys(ids);
-    }
+	private void findAllChildID(Long parentID,List<StudentCourseHomeworkReply> datas,List<Long> results){
+		for(StudentCourseHomeworkReply data:datas){
+			if(parentID.equals(data.getParentId())){
+				results.add(data.getId());
+				findAllChildID(data.getId(),datas,results);
+			}
+		}
+	}
 
-    private void findAllChildID(Long parentID,List<StudentCourseHomeworkReply> datas,List<Long> results){
-        for(StudentCourseHomeworkReply data:datas){
-            if(parentID.equals(data.getParentId())){
-                results.add(data.getId());
-                findAllChildID(data.getId(),datas,results);
-            }
-        }
-    }
-
-    private StudentCourseHomeworkCommentDto getTree(StudentCourseHomeworkCommentDto studentCourseHomeworkCommentDto, StudentCourseHomeworkReplyQueryInfo queryInfo){
-        PageInfo pageInfo = super.queryPage(queryInfo);
-        if(pageInfo != null && pageInfo.getRows().size() > 0) {
-            studentCourseHomeworkCommentDto.setReplys(pageInfo.getRows());
-            for (Object  object: pageInfo.getRows()) {
-                queryInfo.setParentID(((StudentCourseHomeworkCommentDto)object).getReplyId());
-                getTree((StudentCourseHomeworkCommentDto) object,queryInfo);
-            }
-        }
-        return studentCourseHomeworkCommentDto;
-    }
+	private StudentCourseHomeworkCommentDto getTree(StudentCourseHomeworkCommentDto studentCourseHomeworkCommentDto, StudentCourseHomeworkReplyQueryInfo queryInfo){
+		PageInfo pageInfo = super.queryPage(queryInfo);
+		if(pageInfo != null && pageInfo.getRows().size() > 0) {
+			studentCourseHomeworkCommentDto.setReplys(pageInfo.getRows());
+			for (Object  object: pageInfo.getRows()) {
+				queryInfo.setParentID(((StudentCourseHomeworkCommentDto)object).getReplyId());
+				getTree((StudentCourseHomeworkCommentDto) object,queryInfo);
+			}
+		}
+		return studentCourseHomeworkCommentDto;
+	}
 
 }

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

@@ -11,7 +11,6 @@ import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleReview;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
-import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
@@ -117,9 +116,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             userMap.put(courseSchedule.getActualTeacherId(), courseSchedule.getActualTeacherId().toString());
             SysUser user = teacherDao.getUser(bean.getUserId());
             String notifyUrl = "9?courseScheduleID=" + bean.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
-            String extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&userId=" + bean.getUserId() + "&studentCourseHomeworkId=" + bean.getId() + "&extra=0";
             String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
-            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),extra,
+            sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_SUBMIT_PUSH,bean.getUserId().toString(),null,
                     new String[]{courseSchedule.getActualTeacherId().toString()},
                     null,courseDate,courseSchedule.getName());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_SUBMIT_PUSH,

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

@@ -290,7 +290,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}else if(DateUtil.minutesBetween(date,add1Minutes) > 0){
 				//正常签到范围(开始之前)
 				isSign = true;
-			}else {
+			}else if(DateUtil.minutesBetween(add1Minutes,date) >= 0){
 				//异常签到范围(开始之后)
 				isSign = true;
 				teacherAttendance.setSignInStatus(YesOrNoEnum.NO);

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

@@ -0,0 +1,21 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.TeacherSalaryModifyLogDao;
+import com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog;
+import com.ym.mec.biz.service.TeacherSalaryModifyLogService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TeacherSalaryModifyLogServiceImpl extends BaseServiceImpl<Long, TeacherSalaryModifyLog>  implements TeacherSalaryModifyLogService {
+	
+	@Autowired
+	private TeacherSalaryModifyLogDao teacherSalaryModifyLogDao;
+
+	@Override
+	public BaseDAO<Long, TeacherSalaryModifyLog> getDAO() {
+		return teacherSalaryModifyLogDao;
+	}
+}

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.TeacherSalaryModifyLogDao">
+
+    <resultMap type="com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog" id="TeacherSalaryModifyLog">
+        <result column="id_" property="id"/>
+        <result column="teacher_id_" property="teacherId"/>
+        <result column="course_schedule_id_" property="courseScheduleId"/>
+        <result column="pre_expect_salary_" property="preExpectSalary"/>
+        <result column="pre_reduce_salary_" property="preReduceSalary"/>
+        <result column="current_expect_salary_" property="currentExpectSalary"/>
+        <result column="current_reduce_salary_" property="currentReduceSalary"/>
+        <result column="memo_" property="memo"/>
+        <result column="operator_id_" property="operatorId"/>
+        <result column="create_time_" property="createTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="TeacherSalaryModifyLog">
+		SELECT * FROM teacher_salary_modify_log WHERE id_ = #{id}
+	</select>
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="TeacherSalaryModifyLog">
+		SELECT * FROM teacher_salary_modify_log ORDER BY id_
+	</select>
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        INSERT INTO teacher_salary_modify_log (teacher_id_,course_schedule_id_,pre_expect_salary_,pre_reduce_salary_,current_expect_salary_,current_reduce_salary_,memo_,operator_id_,create_time_)
+        VALUES(#{teacherId},#{courseScheduleId},#{preExpectSalary},#{preReduceSalary},#{currentExpectSalary},#{currentReduceSalary},#{memo},#{operatorId},NOW())
+    </insert>
+</mapper>

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

@@ -145,20 +145,6 @@ public class RoomServiceImpl implements RoomService {
                 log.info("join error: roomId = {}, userName = {}, isAudience = {}", roomId, userName, isAudience);
                 throw new ApiException(ErrorEnum.ERR_OVER_MAX_COUNT);
             }
-            /*if (!isAudience) {
-                List<RoomMember> assistantList = roomMemberDao.findByRidAndRole(roomId, RoleEnum.RoleAssistant.getValue());
-                if (!assistantList.isEmpty()) {
-                    if (count == 1) {
-                        roleEnum = RoleEnum.RoleTeacher;
-                    } else {
-                        roleEnum = RoleEnum.RoleStudent;
-                    }
-                } else {
-                    roleEnum = RoleEnum.RoleAssistant;
-                }
-            } else {
-                roleEnum = RoleEnum.RoleAudience;
-            }*/
             if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
                 roleEnum = RoleEnum.RoleTeacher;
             }else {

mec-web/src/main/java/com/ym/mec/web/controller/TeacherSalaryModifyLogController.java

@@ -0,0 +1,45 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.ClassGroup4MixDto;
+import com.ym.mec.biz.dal.dto.HighClassGroupDto;
+import com.ym.mec.biz.dal.dto.TestDto;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.TeacherSalaryModifyLog;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
+import com.ym.mec.biz.dal.page.EndCourseScheduleQueryInfo;
+import com.ym.mec.biz.dal.page.queryMusicGroupCourseScheduleQueryInfo;
+import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
+import com.ym.mec.biz.service.TeacherSalaryModifyLogService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+@RequestMapping("teacherSalaryModifyLog")
+@Api(tags = "班级服务")
+@RestController
+public class TeacherSalaryModifyLogController extends BaseController {
+
+    @Autowired
+    private TeacherSalaryModifyLogService teacherSalaryModifyLogService;
+
+    @ApiOperation(value = "终极班级信息获取")
+    @RequestMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('teacherSalaryModifyLog/add')")
+    public Object add(TeacherSalaryModifyLog modifyLog){
+        return succeed(teacherSalaryModifyLogService.insert(modifyLog));
+    }
+}