Browse Source

1、分班调整
2、新闻发布调整

dzx 9 months ago
parent
commit
282c33535d

+ 1 - 1
src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -157,7 +157,7 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
         );
         List<Long> studentIds = classStudents.stream().map(BandingTaskClassStudent::getNewStudentId).collect(Collectors.toList());
 
-        List<String> orderColumn = new ArrayList();
+        List<String> orderColumn = new ArrayList<>();
         orderColumn.add("score");
         List<BaseNewStudent> baseNewStudents = newStudentService.selectJoinList(BaseNewStudent.class,
                 new MPJLambdaWrapper<BaseNewStudent>()

+ 2 - 0
src/main/java/com/xjrsoft/module/liteflow/node/NewsSendMessageNode.java

@@ -25,6 +25,8 @@ public class NewsSendMessageNode extends NodeComponent {
         if (formId != null) {
             // 数据处理
             newsService.dataHandle(formId);
+            newsService.SendMessage(formId);
+
         }
     }
 }

+ 7 - 3
src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -778,9 +778,13 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
     @Override
     public boolean dataHandle(Long id) {
-        CompletableFuture.runAsync(() -> {
-            this.SendMessage(id);
-        });
+        News news = this.getById(id);
+        if(news.getTypeId() != 1){
+            return true;
+        }
+        news.setSendRange(2);
+        this.updateById(news);
+        newsRelationMapper.insertAllTeaStaff(news.getId());
         return true;
     }