Merge remote-tracking branch 'origin/master'

feige

2024-08-28 8429b26635252973e325d020af1a4485a0bbfdb0

 zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java

@@ -22,12 +22,8 @@


import javax.annotation.Resource;

import java.io.IOException;

import java.sql.Timestamp;

import java.time.LocalDateTime;

import java.util.*;

import java.util.stream.Collectors;



import static com.ruoyi.constant.MenuAuthority.*;



@Slf4j

@Service

@@ -54,7 +50,7 @@
    private LambdaQueryWrapper<Meeting> buildCondition(Meeting meeting) {

        LambdaQueryWrapper<Meeting> lqw = new LambdaQueryWrapper<>();

    //    lqw.in(ZfDoctor::getFamilyId,familyIdList);

        lqw.orderByDesc(Meeting::getCreateTime);

        lqw.orderByDesc(Meeting::getId);

        lqw.like(StringUtils.isNotEmpty(meeting.getPlace()), Meeting::getPlace, meeting.getPlace())

                .like(StringUtils.isNotEmpty(meeting.getApplyApart()), Meeting::getApplyApart, meeting.getApplyApart());

//                .like(Integer.valueOf(meeting.getApplyPerson())!=null, Meeting::getApplyPerson, meeting.getApplyPerson());

@@ -182,7 +178,7 @@
        //操作后加入日志

        ZfLog zfLog = new ZfLog();

        zfLog.setUpdateTime(LocalDateTime.now());

        zfLog.setModule("会议");

        zfLog.setModule("会议申请");

        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());

        zfLogService.save(zfLog);

//        System.out.println("===================================="+meeting);