diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java
index 66a898b4..0105bb77 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java
@@ -664,4 +664,37 @@ public class WjxWjxxController extends JeecgController<WjxWjxx, IWjxWjxxService>
 		 return Result.OK(wjxWjxx);
 	 }
 
+
+
+	 @ApiOperation(value="问卷信息-微信提醒", notes="微信提醒")
+	 @GetMapping(value = "/sendWxtx")
+	 public void sendWxtx(@RequestParam(name="id",required=true) String id,@RequestParam(name="wjlx",required=true) String wjlx) {
+		 WjxWjxx wjxWjxx=wjxWjxxService.getById(id);
+		 QueryWrapper<Xxhbbks> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.apply("a.xh = b.xh");
+		 queryWrapper.eq("b.KCAPZBBH",wjxWjxx.getRwbh());
+		 List<Xxhbbks> list = xxhbbksService.getXsxkbAllList(queryWrapper);
+		 String content = "";
+
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 if(StringUtils.equals(wjlx,"6")){
+			 content = sysUser.getRealname()+"教师发起了["+wjxWjxx.getKcmc()+"]课程“"+wjxWjxx.getTitle()+"”测验,该测验完成时间： "+DateUtils.formatDate(wjxWjxx.getStartTime(),"yyyy-MM-dd")+" ~ "+DateUtils.formatDate(wjxWjxx.getEndTime(),"yyyy-MM-dd")+"，请及时完成";
+		 }else{
+			 content = sysUser.getRealname()+"教师发起了["+wjxWjxx.getKcmc()+"]课程“"+wjxWjxx.getTitle()+"”问卷,该问卷完成时间： "+DateUtils.formatDate(wjxWjxx.getStartTime(),"yyyy-MM-dd")+" ~ "+DateUtils.formatDate(wjxWjxx.getEndTime(),"yyyy-MM-dd")+"，请及时完成";
+		 }
+		 for(Xxhbbks xxhbbks:list){
+
+			try {
+				KcWechatSendLog kcWechatSendLog = new KcWechatSendLog();
+//				 kcWechatSendLog.setOpenid(xxhbbks.getXh());
+				kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号
+				kcWechatSendLog.setYtkcs(content);
+				sendWxmessage(kcWechatSendLog);
+			}catch (Exception e){
+				e.printStackTrace();
+			}
+			break;
+		 }
+	 }
+
  }
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java
index 8d74c5fd..eeddf570 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfo/controller/ZyInfoController.java
@@ -827,4 +827,69 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
 		List<ZyInfo> zyInfo = zyInfoService.zyzb(rwbh,xqxn,teano,zyLeixing);
 		return Result.OK(zyInfo);
 	}
+
+
+
+	/**
+	 *  编辑
+	 *
+	 * @param zyInfo
+	 * @return
+	 */
+	@AutoLog(value = "作业发布-微信提醒")
+	@ApiOperation(value="作业发布-微信提醒", notes="作业发布-微信提醒")
+	@RequestMapping(value = "/sendWxtx", method = {RequestMethod.PUT,RequestMethod.POST})
+	public void sendWxtx(@RequestBody ZyInfo zyInfo) {
+
+		ZyInfo zyInfo2 = zyInfoService.getById(zyInfo.getId());
+		if(StringUtils.equals(zyInfo2.getZyStatus(),"1")){
+			QueryWrapper<KcKechengbiao> kcKechengbiaoQueryWrapper = new QueryWrapper<>();
+			kcKechengbiaoQueryWrapper.eq("rwbh",zyInfo.getRwbh());
+			kcKechengbiaoQueryWrapper.eq("jgh",zyInfo.getCreateBy());
+			kcKechengbiaoQueryWrapper.eq("xqxn",zyInfo.getXnxq());
+			kcKechengbiaoQueryWrapper.last("limit 1");
+			KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper);
+
+			QueryWrapper<ZyDbtx> zyDbtxQueryWrapper = new QueryWrapper<>();
+			zyDbtxQueryWrapper.eq("type","2");//发送作业
+			zyDbtxQueryWrapper.eq("rwbh",zyInfo.getRwbh());
+			List<ZyDbtx> dbtxlist = zyDbtxService.list(zyDbtxQueryWrapper);
+			String xharrs[] = new String[dbtxlist.size()];
+			for(int i=0;i<dbtxlist.size();i++){
+				xharrs[i] = dbtxlist.get(i).getCreateBy();
+			}
+
+			QueryWrapper<Xxhbbks> queryWrapper = new QueryWrapper<>();
+			queryWrapper.apply("a.xh = b.xh");
+			queryWrapper.eq("b.KCAPZBBH",zyInfo2.getRwbh());
+			if(xharrs.length>0){
+				queryWrapper.notIn("a.xh",xharrs);
+			}
+			List<Xxhbbks> list = xxhbbksService.getXsxkbAllList(queryWrapper);
+
+			LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			for(Xxhbbks xxhbbks:list) {
+
+				ZyDbtx zyDbtx = new ZyDbtx();
+				if(StringUtils.equals(zyInfo.getZyLeixing(),"0")) {
+					zyDbtx.setType("0");//0发布作业 1评分 2测验 3问卷 4讨论
+					zyDbtx.setContent(user.getRealname() + "老师主讲的[" + kcKechengbiao.getKcmc() + "]课程于" + DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss") + "发布了一篇题目为“" + zyInfo.getTitle() + "”的作业，该作业提交时间为：" + DateUtils.formatDate(zyInfo.getStartTime(), "yyyy-MM-dd HH:mm") + " ~ " + DateUtils.formatDate(zyInfo.getEndTime(), "yyyy-MM-dd HH:mm") + "，请按时完成！  " );
+				}else if (StringUtils.equals(zyInfo.getZyLeixing(),"1")){
+					zyDbtx.setType("10");//0发布作业 1评分 2测验 3问卷 4讨论
+					zyDbtx.setContent(user.getRealname() + "老师主讲的[" + kcKechengbiao.getKcmc() + "]课程于" + DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss") + "发布了一篇题目为“" + zyInfo.getTitle() + "”的期末考试，该期末考试提交时间为：" + DateUtils.formatDate(zyInfo.getStartTime(), "yyyy-MM-dd HH:mm") + " ~ " + DateUtils.formatDate(zyInfo.getEndTime(), "yyyy-MM-dd HH:mm") + "，请按时完成！  " );
+				}
+				try {
+					KcWechatSendLog kcWechatSendLog = new KcWechatSendLog();
+					kcWechatSendLog.setOpenid("2016900057");//指定曹老师账号
+//					kcWechatSendLog.setOpenid(xxhbbks.getXh());
+					kcWechatSendLog.setYtkcs(zyDbtx.getContent());
+					sendWxmessage(kcWechatSendLog);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				break;
+			}
+		}
+	}
+
 }