Commit 906c345dcc6e5c519588c7e8bd6320709533543a

Authored by 504987307@qq.com
1 parent 22b745bb
Exists in master

推送修改

cloud/quartz/src/main/java/com/sincere/quartz/job/KQJob.java
@@ -302,7 +302,7 @@ public class KQJob { @@ -302,7 +302,7 @@ public class KQJob {
302 DingSms dingSms = new DingSms(); 302 DingSms dingSms = new DingSms();
303 dingSms.setName(teacher.getName()); 303 dingSms.setName(teacher.getName());
304 dingSms.setTableName("DingSmsNew"+tableSuffix); 304 dingSms.setTableName("DingSmsNew"+tableSuffix);
305 - dingSms.setMsg(" # 考勤报告 \n - 报告类型:"+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+ 305 + dingSms.setMsg("报告类型:"+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+
306 "签到日期:"+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+ 306 "签到日期:"+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+
307 "签到时间:"+times[0]+"-"+ times[1] +" \n - "+ 307 "签到时间:"+times[0]+"-"+ times[1] +" \n - "+
308 "整体数据:" + message); 308 "整体数据:" + message);
@@ -337,7 +337,7 @@ public class KQJob { @@ -337,7 +337,7 @@ public class KQJob {
337 DingSms dingSms = new DingSms(); 337 DingSms dingSms = new DingSms();
338 dingSms.setName(teacher.getName()); 338 dingSms.setName(teacher.getName());
339 dingSms.setTableName("DingSmsNew"+tableSuffix); 339 dingSms.setTableName("DingSmsNew"+tableSuffix);
340 - dingSms.setMsg(" # 考勤报告 \n - 报告类型:"+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+ 340 + dingSms.setMsg("报告类型:"+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+
341 "签到日期:"+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+ 341 "签到日期:"+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+
342 "签到时间:"+times[0]+"-"+ times[1] +" \n - "+ 342 "签到时间:"+times[0]+"-"+ times[1] +" \n - "+
343 "整体数据:" + message); 343 "整体数据:" + message);
@@ -370,7 +370,7 @@ public class KQJob { @@ -370,7 +370,7 @@ public class KQJob {
370 } 370 }
371 WeChatSms weChatSms = new WeChatSms(); 371 WeChatSms weChatSms = new WeChatSms();
372 weChatSms.setTableName("qyhSmsNew" + tableSuffix); 372 weChatSms.setTableName("qyhSmsNew" + tableSuffix);
373 - weChatSms.setMsg(" # 考勤报告 \n - 报告类型:" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " + 373 + weChatSms.setMsg("报告类型:" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
374 "签到日期:" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " + 374 "签到日期:" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
375 "签到时间:" + times[0] + "-" + times[1] + " \n - " + 375 "签到时间:" + times[0] + "-" + times[1] + " \n - " +
376 "整体数据:" + message); 376 "整体数据:" + message);
@@ -406,7 +406,7 @@ public class KQJob { @@ -406,7 +406,7 @@ public class KQJob {
406 } 406 }
407 WeChatSms weChatSms = new WeChatSms(); 407 WeChatSms weChatSms = new WeChatSms();
408 weChatSms.setTableName("qyhSmsNew" + tableSuffix); 408 weChatSms.setTableName("qyhSmsNew" + tableSuffix);
409 - weChatSms.setMsg(" # 考勤报告 \n - 报告类型:" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " + 409 + weChatSms.setMsg("报告类型:" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
410 "签到日期:" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " + 410 "签到日期:" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
411 "签到时间:" + times[0] + "-" + times[1] + " \n - " + 411 "签到时间:" + times[0] + "-" + times[1] + " \n - " +
412 "整体数据:" + message); 412 "整体数据:" + message);
cloud/quartz/src/main/resources/mapper/SmsMapper.xml
@@ -4,16 +4,16 @@ @@ -4,16 +4,16 @@
4 4
5 <insert id="insertDing" parameterType="com.sincere.quartz.model.DingSms"> 5 <insert id="insertDing" parameterType="com.sincere.quartz.model.DingSms">
6 insert into ${tableName} (Msg, MsgID, SchoolID, Type, Status, intime, sendtime, DingUserId, WapUrl, agentid, 6 insert into ${tableName} (Msg, MsgID, SchoolID, Type, Status, intime, sendtime, DingUserId, WapUrl, agentid,
7 - tdtype, ReceiveUserID, Remark) 7 + tdtype, ReceiveUserID, Remark,Title)
8 values (#{msg}, -1, #{schoolId}, 1, 0, GETDATE(), GETDATE(), #{dingUserId}, #{wapUrl}, #{agentId}, #{tdType}, 8 values (#{msg}, -1, #{schoolId}, 1, 0, GETDATE(), GETDATE(), #{dingUserId}, #{wapUrl}, #{agentId}, #{tdType},
9 - #{receiveUserId}, #{name}) 9 + #{receiveUserId}, #{name},"考勤通知")
10 </insert> 10 </insert>
11 11
12 <insert id="insertWeChat" parameterType="com.sincere.quartz.model.WeChatSms"> 12 <insert id="insertWeChat" parameterType="com.sincere.quartz.model.WeChatSms">
13 insert into ${tableName} (SchoolID, MsgID, Guid, WapUrl, Status, intime, sendTime, SendUserName, ReceiveUserID, 13 insert into ${tableName} (SchoolID, MsgID, Guid, WapUrl, Status, intime, sendTime, SendUserName, ReceiveUserID,
14 - QiYeHaoUserId, AppID, Secret, tdtype, Remark) 14 + QiYeHaoUserId, AppID, Secret, tdtype, Remark,Title)
15 values (#{schoolId}, -1, #{msg}, #{msgUrl}, 0, GETDATE(), GETDATE(), '智能校卫', #{receiveUserId}, #{qiYeHaoUserId}, 15 values (#{schoolId}, -1, #{msg}, #{msgUrl}, 0, GETDATE(), GETDATE(), '智能校卫', #{receiveUserId}, #{qiYeHaoUserId},
16 - #{appId}, #{secret}, #{tdType}, #{name}) 16 + #{appId}, #{secret}, #{tdType}, #{name},"考勤通知")
17 </insert> 17 </insert>
18 18
19 <insert id="insertSMS" parameterType="com.sincere.quartz.model.ShortMsg"> 19 <insert id="insertSMS" parameterType="com.sincere.quartz.model.ShortMsg">