1、试读报到，变更为已报到不受时间限制

2、新闻数量统计调整

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -490,6 +490,8 @@ public class NewsController {
                         .eq(News::getStatus, 2)
                         .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                         .eq(NewsRelation::getReadMark, 0)
+                        .eq(News::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(News::getEnabledMark, EnabledMark.ENABLED.getCode())
         );
 
         //公告发给非全体的
@@ -500,6 +502,8 @@ public class NewsController {
                         .eq(SystemUpdateMessage::getDeleteMark, DeleteMark.NODELETE.getCode())
                         .eq(SystemUpdateMessage::getStatus, 1)
                         .eq(SystemUpdateMessageNotice::getStatus, 0)
+                        .eq(SystemUpdateMessageNotice::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .eq(SystemUpdateMessageNotice::getEnabledMark, EnabledMark.ENABLED.getCode())
         );
 
         Long notReadCount = notReadCountNews + systemUpdateMessageCount;

src/main/java/com/xjrsoft/module/student/controller/StudentTryReadingReportController.java

@@ -171,6 +171,7 @@ public class StudentTryReadingReportController {
         for (Long id : ids) {
             recordService.tryReadingSign(new StudentReportSignDto(){{
                 setId(id);
+                setIsBatch(1);
             }});
         }
         return RT.ok(true);

src/main/java/com/xjrsoft/module/student/dto/StudentReportSignDto.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.student.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -19,4 +20,8 @@ public class StudentReportSignDto {
 
     @ApiModelProperty("班级id")
     private Long classId;
+
+    @JsonIgnore
+    @ApiModelProperty("是否批量")
+    private Integer isBatch = 0;
 }

src/main/java/com/xjrsoft/module/student/service/impl/StudentReportRecordServiceImpl.java

@@ -328,7 +328,7 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
         StudentReportRecord record = this.getById(dto.getId());
         LocalDateTime now = LocalDateTime.now();
         StudentReportPlan reportPlan = planMapper.selectById(record.getStudentReportPlanId());
-        if(!LocalDateTimeUtil.isDateTimeInRange(now, reportPlan.getStartTime(), reportPlan.getEndTime())){
+        if(dto.getIsBatch() == 0 && !LocalDateTimeUtil.isDateTimeInRange(now, reportPlan.getStartTime(), reportPlan.getEndTime())){
             throw new MyException("不在修改时间内，无法修改");
         }