Merge branch 'pre'

src/main/java/com/xjrsoft/module/job/AttenDanceWarnNoticeTask.java

@@ -200,7 +200,7 @@ public class AttenDanceWarnNoticeTask {
 
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
-        String table = "wechat_message_log";
+        String table = "attendance_message_log";
         long id = IdUtil.getSnowflakeNextId();
         Entity entity = Entity.create(table);
         entity.set("id", id);

src/main/java/com/xjrsoft/module/job/AttendanceMessageTask.java

@@ -129,7 +129,7 @@ public class AttendanceMessageTask {
         Set<Integer> roleTypes = list.stream().map(AttendanceMessageSet::getRoleType).collect(Collectors.toSet());
 
         //查询需要通知的人
-        String table = "wechat_message_log";
+        String table = "attendance_message_log";
         boolean isInsert = true;
         for (AttendanceMessageSet messageSet : list) {
             LocalDateTime recentlyTime = null;
@@ -148,7 +148,7 @@ public class AttendanceMessageTask {
                 Entity entity = Entity.create(table);
                 entity.set("send_time", recentlyTime);
                 entity.set("template_id", wechatTemplate);
-                String sql = "SELECT COUNT(*) FROM wechat_message_log WHERE delete_mark = 0 AND template_id = '" + wechatTemplate
+                String sql = "SELECT COUNT(*) FROM " + table + " WHERE delete_mark = 0 AND template_id = '" + wechatTemplate
                         + "' AND send_time = '" + recentlyTime.format(formatter) + "'";
                 long count = SqlRunnerAdapter.db().selectCount(sql);
                 if (count > 0) {//已经推送过，不再进行推送
@@ -165,7 +165,7 @@ public class AttendanceMessageTask {
                     isInsert = false;
                     continue;
                 }
-                String sql = "SELECT COUNT(*) FROM wechat_message_log WHERE delete_mark = 0 AND template_id = '" + wechatTemplate
+                String sql = "SELECT COUNT(*) FROM " + table + " WHERE delete_mark = 0 AND template_id = '" + wechatTemplate
                         + "' AND send_time = '" + recentlyTime.format(formatter) + "'";
                 long count = SqlRunnerAdapter.db().selectCount(sql);
                 if (count > 0) {//已经推送过，不再进行推送