|
|
@@ -4,8 +4,10 @@ import java.util.Calendar;
|
|
|
import java.util.List;
|
|
|
|
|
|
import com.ruoyi.branch.domain.TBranchActivityNotice;
|
|
|
+import com.ruoyi.branch.domain.TBranchLearning;
|
|
|
import com.ruoyi.branch.domain.TBranchPlanItem;
|
|
|
import com.ruoyi.branch.service.ITBranchActivityNoticeService;
|
|
|
+import com.ruoyi.branch.service.ITBranchLearningService;
|
|
|
import com.ruoyi.branch.service.ITBranchPlanItemService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
@@ -44,6 +46,9 @@ public class SysNoticeController extends BaseController
|
|
|
@Autowired
|
|
|
private ITBranchActivityNoticeService activityNoticeService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITBranchLearningService learningService;
|
|
|
+
|
|
|
/**
|
|
|
* 获取通知公告列表（不分页）
|
|
|
*/
|
|
|
@@ -81,6 +86,20 @@ public class SysNoticeController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 学习计划（未开始或未完成）
|
|
|
+ if (getUserId() != null) {
|
|
|
+ List<TBranchLearning> tBranchLearnings = learningService.selectTBranchLearningList(new TBranchLearning());
|
|
|
+ for (TBranchLearning tBranchLearning : tBranchLearnings) {
|
|
|
+ if (getUserId().equals(tBranchLearning.getUserId()) // 当前登录用户 && !已完成
|
|
|
+ && !tBranchLearning.getLearningStatus().equals("2")) {
|
|
|
+ SysNotice sysNotice = new SysNotice();
|
|
|
+ sysNotice.setReleaseTime(tBranchLearning.getLearningDeadline());
|
|
|
+ sysNotice.setNoticeTitle("学习：" + tBranchLearning.getFileName());
|
|
|
+ sysNotices.add(sysNotice);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return AjaxResult.success(sysNotices);
|
|
|
}
|
|
|
|
