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

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

@@ -125,7 +125,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 					MusicGroup musicGroup = musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId());
 					String memo = "4?http://mstudev.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
 					// 发送续费通知
-					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push, null, 0, memo,"STUDENT",musicGroup.getName());
+					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
+							null, 0, memo, "STUDENT", musicGroup.getName());
 				}
 			}
 		}
@@ -158,7 +159,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 		for (MusicGroupPaymentCalender mgpc : musicGroupPaymentCalenderList) {
 
-			if (mgpc.getDeadlinePaymentDate() != null && date.after(mgpc.getDeadlinePaymentDate())) {
+			if (mgpc.getDeadlinePaymentDate() != null && date.after(mgpc.getDeadlinePaymentDate()) && mgpc.getPaymentStatus() == PaymentStatusEnum.OPEN) {
 				// “进行中”更新至“已结束”
 				mgpc.setUpdateTime(date);
 				mgpc.setPaymentStatus(PaymentStatusEnum.YES);
@@ -166,7 +167,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 				// 学生状态更新已结束
 
-			} else if (mgpc.getStartPaymentDate() != null && date.after(mgpc.getStartPaymentDate())) {
+			} else if (mgpc.getStartPaymentDate() != null && date.after(mgpc.getStartPaymentDate()) && mgpc.getPaymentStatus() == PaymentStatusEnum.NO) {
 				// “未开始”更新至“进行中”
 				mgpc.setUpdateTime(date);
 				mgpc.setPaymentStatus(PaymentStatusEnum.OPEN);
@@ -211,7 +212,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 					MusicGroup musicGroup = musicGroupDao.get(mgpc.getMusicGroupId());
 					String memo = "4?http://mstudev.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
 					// 发送续费通知
-					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push, null, 0, memo,"STUDENT",musicGroup.getName());
+					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
+							null, 0, memo, "STUDENT", musicGroup.getName());
 				}
 			}
 		}

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

@@ -458,18 +458,17 @@
         SELECT
         t.user_id_ studentId,
         t.educational_teacher_id_ educationalTeacherId,
-        su.username_ educationalTeacherName
+        su.real_name_ educationalTeacherName
         FROM
         (
         SELECT
-        cgsm.user_id_,
+        mgsf.user_id_,
         g.educational_teacher_id_
         FROM
-        class_group_student_mapper cgsm
-        LEFT JOIN music_group g ON cgsm.music_group_id_ = g.id_
+        music_group_student_fee_ mgsf
+        LEFT JOIN music_group g ON mgsf.music_group_id_ = g.id_
         WHERE
-        cgsm.group_type_ = 'MUSIC'
-        AND cgsm.user_id_ IN
+        mgsf.user_id_ IN
         <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
             #{studentId}
         </foreach>

mec-task/src/main/java/com/ym/mec/task/controller/TaskController.java

@@ -43,7 +43,7 @@ public class TaskController extends BaseController {
 
 	@ApiOperation("任务列表分页查询")
 	@GetMapping("/list")
-	public HttpResponseResult list(TaskQueryInfo queryInfo) {
+	public HttpResponseResult<PageInfo<Task>> list(TaskQueryInfo queryInfo) {
 		PageInfo<Task> pageInfo = new PageInfo<Task>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
@@ -65,7 +65,7 @@ public class TaskController extends BaseController {
 	@ApiOperation("执行当前任务")
 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
 	@PostMapping("/execute/{taskId}")
-	public HttpResponseResult execute(@PathVariable("taskId") int taskId) {
+	public HttpResponseResult<Object> execute(@PathVariable("taskId") int taskId) {
 		boolean result = false;
 		try {
 			result = taskService.execute(taskId, scheduler);
@@ -79,7 +79,7 @@ public class TaskController extends BaseController {
 	@ApiOperation("暂停当前任务")
 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
 	@PostMapping("/pause/{taskId}")
-	public HttpResponseResult pause(@PathVariable("taskId") int taskId) {
+	public HttpResponseResult<Object> pause(@PathVariable("taskId") int taskId) {
 		boolean result = false;
 		try {
 			result = taskService.pause(taskId, scheduler);
@@ -93,7 +93,7 @@ public class TaskController extends BaseController {
 	@ApiOperation("暂停当前任务")
 	@ApiImplicitParam(name = "taskId", value = "任务编号", required = true, dataType = "Integer", paramType = "path")
 	@PostMapping("/resume/{taskId}")
-	public HttpResponseResult resume(@PathVariable("taskId") int taskId) {
+	public HttpResponseResult<Object> resume(@PathVariable("taskId") int taskId) {
 		boolean result = false;
 		try {
 			result = taskService.resume(taskId, scheduler);