1、班级量化考核调整

2、通知公告未读统计数量调整

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

@@ -357,6 +357,7 @@ public class NewsController {
                                 .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                                 .eq(News::getTypeId, typeId)
                                 .eq(NewsRelation::getReadMark, 0)
+                                .gt(News::getSendEndDate, LocalDateTime.now())
                 );
                 newsCountTypeVo.setTypeId(typeId);
                 newsCountTypeVo.setTotal(notReadCount);
@@ -380,6 +381,7 @@ public class NewsController {
                                 .eq(News::getStatus, 2)
                                 .eq(NewsRelation::getUserId, StpUtil.getLoginIdAsLong())
                                 .eq(News::getTypeId, typeId)
+                                .gt(News::getSendEndDate, LocalDateTime.now())
                                 .eq(NewsRelation::getReadMark, 0)
                 );
 

src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -256,6 +256,9 @@
         <if test="dto.endTime != null">
             and t.create_date &lt; #{dto.endTime}
         </if>
+        <if test="dto.year != null and dto.month != null">
+            and DATE_FORMAT(t.assessment_date, '%Y-%m') = concat(#{dto.year}, '-', #{dto.month})
+        </if>
         group by t.class_ids;
     </select>