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

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

@@ -197,7 +197,7 @@ public class WfMeetingApplyController {
     @SaCheckPermission("wfmeetingapply:detail")
     @XjrLog(value = "会议签到二维码-生成二维码")
     public RT<String> qrcode(@RequestParam Long id) throws Exception {
-        String url = commonPropertiesConfig.getDomainApp() + "/pages/meeting/permissions?id=" + id + "&type=1";
+        String url = commonPropertiesConfig.getDomainApp() + "/pages/meeting/permissions?id=" + id + "&type=0";
         int width = 400;
         int height = 400;
         int margin = 1;

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

@@ -205,11 +205,14 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
                 .le(ObjectUtils.isNotEmpty(dto.getEndMeetingApplyDate()), WfMeetingApply::getMeetingApplyDate, dto.getEndMeetingApplyDate())
                 .eq(StringUtils.isNotEmpty(dto.getMeetingApplyFormat()), WfMeetingApply::getMeetingApplyFormat, dto.getMeetingApplyFormat())
                 .like(StringUtils.isNotEmpty(dto.getMeetingApplyTheme()), WfMeetingApply::getMeetingApplyTheme, dto.getMeetingApplyTheme())
+                .orderByDesc(WfMeetingApply::getMeetingApplyDate)
+                .orderByAsc(WfMeetingApply::getMeetingApplyS)
         ;
         if (ObjectUtils.isNotEmpty(dto.getMeetingStatus()) && dto.getMeetingStatus() == 0) {
             wfMeetingApplyPageVoMPJLambdaWrapper
                     .ge(WfMeetingApply::getMeetingApplyDate, nowLocalDate)
                     .gt(WfMeetingApply::getMeetingApplyS, nowLocalTime)
+                    .ne(WfMeetingApply::getMeetingStatus, 1)
             ;
         }
 
@@ -223,6 +226,7 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
             wfMeetingApplyPageVoMPJLambdaWrapper
                     .le(WfMeetingApply::getMeetingApplyDate, nowLocalDate)
                     .lt(WfMeetingApply::getMeetingApplyE, nowLocalTime)
+                    .ne(WfMeetingApply::getMeetingStatus, 1)
             ;
         }
 
@@ -231,6 +235,7 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
                     .eq(WfMeetingApply::getMeetingApplyDate, nowLocalDate)
                     .le(WfMeetingApply::getMeetingApplyS, nowLocalTime)
                     .ge(WfMeetingApply::getMeetingApplyE, nowLocalTime)
+                    .ne(WfMeetingApply::getMeetingStatus, 1)
             ;
         }
 
@@ -467,14 +472,16 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
             List<File> fileList = fileMapper.selectList(Wrappers.<File>query().lambda().eq(File::getFolderId, info.getPreMeetingInfoFileId()));
             info.setFileInfos(fileList);
 
-            // 处理签到状态
+            // 如果是会议参会人员，应该处理签到状态
             LambdaQueryWrapper<MeetingConferee> meetingConfereeLambdaQueryWrapper = new LambdaQueryWrapper<>();
             meetingConfereeLambdaQueryWrapper
                     .eq(MeetingConferee::getUserId, StpUtil.getLoginIdAsLong())
                     .eq(MeetingConferee::getWfMeetingApplyId, id)
                     ;
             MeetingConferee meetingConferee = meetingConfereeMapper.selectOne(meetingConfereeLambdaQueryWrapper);
-            info.setCheckInStatus(meetingConferee.getCheckInStatus());
+            if(ObjectUtils.isNotEmpty(meetingConferee)){
+                info.setCheckInStatus(meetingConferee.getCheckInStatus());
+            }
 
             // 处理状态
             LocalTime nowLocalTime = LocalTime.now();