Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/oa/service/impl/WfMeetingApplyServiceImpl.java

@@ -294,7 +294,7 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
         Map<String, LocalTime> startTimeMap = record.stream().collect(Collectors.toMap(TodayMeetingMobilePageVo::getId, TodayMeetingMobilePageVo::getMeetingApplyS));
         Map<String, LocalTime> endTimeMap = record.stream().collect(Collectors.toMap(TodayMeetingMobilePageVo::getId, TodayMeetingMobilePageVo::getMeetingApplyE));
         for (TodayMeetingMobilePageVo vo : record) {
-            Integer adjustType = 1;
+            int adjustType = 1;
             LocalTime oneStartTime = vo.getMeetingApplyS();
             LocalTime oneEndTime =  vo.getMeetingApplyE();
             for (String id : startTimeMap.keySet()) {
@@ -478,18 +478,20 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
 
             // 处理状态
             LocalTime nowLocalTime = LocalTime.now();
+            LocalDate nowLocalDate = LocalDate.now();
             if (info.getMeetingStatus() != 1) {
-                if (info.getMeetingApplyE().isBefore(nowLocalTime)) {
-                    if(info.getCheckInStatus() == 0){
-                        info.setMeetingStatus(4);
-                    }
-                    if(info.getCheckInStatus() == 1){
-                        info.setMeetingStatus(2);
-                    }
-                } else if (info.getMeetingApplyS().isAfter(nowLocalTime)) {
+                if (info.getMeetingApplyDate().isBefore(nowLocalDate)) {
+                    info.setMeetingStatus(2);
+                } else if (info.getMeetingApplyDate().isAfter(nowLocalDate)) {
                     info.setMeetingStatus(0);
                 } else {
-                    info.setMeetingStatus(3);
+                    if (info.getMeetingApplyE().isBefore(nowLocalTime)) {
+                        info.setMeetingStatus(2);
+                    } else if (info.getMeetingApplyS().isAfter(nowLocalTime)) {
+                        info.setMeetingStatus(0);
+                    } else {
+                        info.setMeetingStatus(3);
+                    }
                 }
             }
         }

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

@@ -4,6 +4,7 @@ import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.Date;
 import java.util.List;
@@ -36,7 +37,7 @@ public class MeetingMobileInfoVo {
     * 会议日期
     */
     @ApiModelProperty("会议日期")
-    private Date meetingApplyDate;
+    private LocalDate meetingApplyDate;
     /**
     * 会议开始时间
     */

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookStudentClaimServiceImpl.java

@@ -247,6 +247,7 @@ public class TextbookStudentClaimServiceImpl extends MPJBaseServiceImpl<Textbook
         ;
         List<HeadTeaLookClassBookCategoryDetailVo> classList = wfTextbookClaimItemMapper.selectJoinList(HeadTeaLookClassBookCategoryDetailVo.class, classMPJLambdaWrapper);
 
+        // 班级申领教材
         MPJLambdaWrapper<WfTextbookClaimItem> personalMPJLambdaWrapper = new MPJLambdaWrapper<>();
         personalMPJLambdaWrapper
                 .disableSubLogicDel()