zouxuan 5 年之前
父節點
當前提交
8996ab4aae

+ 4 - 4
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/TeacherSalaryComplaintsStatusEnum.java

@@ -4,10 +4,10 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum TeacherSalaryComplaintsStatusEnum implements BaseEnum<String, TeacherSalaryComplaintsStatusEnum> {
 	PENDING("PENDING", "待处理"),
-	Done("DONE", "完成"),
-	AGREED("AGREED", "同意"),
-	DENIED("DENIED", "拒绝"),
-	WITHDRAWN("WITHDRAWN", "撤回");
+	Done("DONE", "完成"),
+	AGREED("AGREED", "同意"),
+	DENIED("DENIED", "拒绝"),
+	WITHDRAWN("WITHDRAWN", "撤回");
 
 	private String code;
 

+ 17 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherSalaryComplaintsServiceImpl.java

@@ -2,20 +2,26 @@ 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.SysConfigDao;
 import com.ym.mec.biz.dal.dao.TeacherSalaryComplaintsDao;
 import com.ym.mec.biz.dal.entity.TeacherSalaryComplaints;
+import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.TeacherSalaryComplaintsStatusEnum;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.TeacherSalaryComplaintsService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.enums.TeacherSalaryComplaintsStatusEnum.PENDING;
 
@@ -27,6 +33,8 @@ public class TeacherSalaryComplaintsServiceImpl extends BaseServiceImpl<Long, Te
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	@Autowired
+	private SysConfigDao sysConfigDao;
+	@Autowired
 	private SysMessageService sysMessageService;
 
 	@Override
@@ -56,7 +64,14 @@ public class TeacherSalaryComplaintsServiceImpl extends BaseServiceImpl<Long, Te
 		salaryComplaints.setHandingSuggestion(complaints.getHandingSuggestion());
 		salaryComplaints.setOperatorId(sysUser.getId());
 		teacherSalaryComplaintsDao.update(salaryComplaints);
-//		sysMessageService.batchSendMessage();
+		Map<Integer, String> map = new HashMap<>(1);
+		map.put(salaryComplaints.getTeacherId(), salaryComplaints.getTeacherId().toString());
+		if (map != null && map.size() > 0) {
+			sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+			String url = new StringBuffer(sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL)).append("/#/appealResult?id").append(salaryComplaints.getId()).toString();
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.COURSE_SALARY_COMPLAINTS_RESULT, map, null, 0, url,
+					"TEACHER", DateUtil.format(salaryComplaints.getCreateTime(),DateUtil.DEFAULT_PATTERN),complaints.getStatusEnum().getMsg());
+		}
 	}
 
 	@Override