系统消息查询调整

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -231,8 +231,8 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             tableVo.setSemesterName(baseSemester.getName());
             LocalDateTime now = LocalDateTime.now();
             //计算本周是第几周
-            LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getStartDate().toInstant(), ZoneId.systemDefault());
-            LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getEndDate().toInstant(), ZoneId.systemDefault());
+            LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getTeachingStart().toInstant(), ZoneId.systemDefault());
+            LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getTeachingEnd().toInstant(), ZoneId.systemDefault());
             Duration between = Duration.between(startDateTime, endDateTime);
             long days = between.toDays();
             int weeks = (int) Math.ceil((double) days / 7);

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

@@ -343,7 +343,7 @@ public class NewsController {
     @ApiOperation(value = "未读类型统计")
     public RT<List<NewsCountTypeVo>> countType() {
         List<NewsCountTypeVo> newsCountTypeVoList = new ArrayList<>();
-        Integer typeIds[] = {1, 2, 3, 4};
+        Integer typeIds[] = {1, 2, 3};
         for (Integer typeId : typeIds) {
             NewsCountTypeVo newsCountTypeVo = new NewsCountTypeVo();
             News news = new News();
@@ -435,7 +435,7 @@ public class NewsController {
                 newsCountTypeVo.setTime(news.getReleaseTime());
                 newsCountTypeVo.setTitle(news.getFullHead());
             }
-            if(typeId == 4){
+            if(typeId == 3){
                 List<SystemUpdateMessage> list = systemUpdateMessageService.list(
                         MPJWrappers.<SystemUpdateMessage>lambdaJoin()
                                 .select(SystemUpdateMessage::getId)

src/main/java/com/xjrsoft/module/oa/vo/NewsCountTypeVo.java

@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 @Data
 public class NewsCountTypeVo {
 
-    @ApiModelProperty("类型（1-新闻2-公告4-系统更新消息）")
+    @ApiModelProperty("类型（1-新闻2-公告3-系统更新消息）")
     private Integer typeId;
 
     @ApiModelProperty("最后一条标题")

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -168,8 +168,8 @@ public class ScheduleController {
             now = dto.getScheduleDate();
         }
         //计算本周是第几周
-        LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getStartDate().toInstant(), ZoneId.systemDefault());
-        LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getEndDate().toInstant(), ZoneId.systemDefault());
+        LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getTeachingStart().toInstant(), ZoneId.systemDefault());
+        LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getTeachingEnd().toInstant(), ZoneId.systemDefault());
         Duration between = Duration.between(startDateTime, endDateTime);
         long days = between.toDays();
         int weeks = (int) Math.ceil((double) days / 7);
@@ -377,8 +377,8 @@ public class ScheduleController {
                 return RT.ok(new ArrayList<>());
             }
         }
-        LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getStartDate().toInstant(), ZoneId.systemDefault());
-        LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getEndDate().toInstant(), ZoneId.systemDefault());
+        LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getTeachingStart().toInstant(), ZoneId.systemDefault());
+        LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getTeachingEnd().toInstant(), ZoneId.systemDefault());
         Duration between = Duration.between(startDateTime, endDateTime);
         long days = between.toDays();
         int weeks = (int) Math.ceil((double) days / 7);

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -347,7 +347,8 @@ public class DataUtil {
     /**
      * 新增学期
      */
-    public Map<String, String> insertSemester(String tableName, Map<String, String> ids) throws Exception {
+    public Map<String, String>
+    insertSemester(String tableName, Map<String, String> ids) throws Exception {
         String sql = "select * from " + tableName + " where delete_mark = 0 order by start_date desc limit 3";
         List<Map<String, Object>> list = SqlRunnerAdapter.db().selectList(sql, BaseSemester.class);
 
@@ -362,12 +363,12 @@ public class DataUtil {
             BaseSemester semester = SqlRunnerAdapterUtil.convertMapToEntity(semesterMap, BaseSemester.class);
             String url  = ScheduleUtil.apiUrl + "semester/Create";
             JsonObject paramJson = new JsonObject();
-            paramJson.addProperty("schoolYear", Integer.parseInt(sdfYear.format(semester.getStartDate())));
+            paramJson.addProperty("schoolYear", Integer.parseInt(sdfYear.format(semester.getStartDate())) - 1);
             Integer period = null;
             if(semester.getName().contains(spring)){
-                period = 1;
-            }else if(semester.getName().contains(autumn)){
                 period = 2;
+            }else if(semester.getName().contains(autumn)){
+                period = 1;
             }
             //获取时间戳
             long timestamp = System.currentTimeMillis();