zqy
2024-07-01 6195b771077bf2ac43eb9562f33128d678dae656
修改bug
5个文件已修改
18 ■■■■ 已修改文件
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingBackServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingRatifyServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -32,12 +32,12 @@
     * 可容纳人数
     */
    @Excel(name = "可容纳人数")
    private int conPeople;
    private Integer conPeople;
    /**
     * 参与人数
     */
    @Excel(name = "参与人数")
    private int partPeople;
    private Integer partPeople;
    /**
     * 申请人
     */
@@ -77,7 +77,7 @@
     * 是否摆放水牌
     */
    @Excel(name = "是否摆放水牌")
    private int isPlacebrand;
    private Integer isPlacebrand;
    /**
     * 联系人
     */
@@ -92,7 +92,7 @@
     * 状态
     */
    @Excel(name = "状态")
    private int statu;
    private Integer statu;
    /**
     * 生成时间
     */
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingBackServiceImpl.java
@@ -22,7 +22,7 @@
    private LambdaQueryWrapper<LiveStreaming> buildCondition(LiveStreaming liveStreaming) {
        LambdaQueryWrapper<LiveStreaming> lqw = new LambdaQueryWrapper<>();
//        lqw.in(LiveStreaming::getFamilyId,familyIdList);
        lqw.orderByDesc(LiveStreaming::getCreateTime);
        lqw.orderByDesc(LiveStreaming::getId);
        lqw.like(StringUtils.isNotEmpty(liveStreaming.getTitle()), LiveStreaming::getTitle, liveStreaming.getTitle())
                .like(StringUtils.isNotEmpty(liveStreaming.getApplyPerson()),LiveStreaming::getApplyPerson,liveStreaming.getApplyPerson())
                .like(StringUtils.isNotEmpty(liveStreaming.getContactPerson()),LiveStreaming::getContactPerson,liveStreaming.getContactPerson());
zhang-content/src/main/java/com/ruoyi/service/impl/LiveStreamingServiceImpl.java
@@ -29,7 +29,7 @@
    private LambdaQueryWrapper<LiveStreaming> buildCondition(LiveStreaming liveStreaming) {
        LambdaQueryWrapper<LiveStreaming> lqw = new LambdaQueryWrapper<>();
//        lqw.in(LiveStreaming::getFamilyId,familyIdList);
        lqw.orderByDesc(LiveStreaming::getCreateTime);
        lqw.orderByDesc(LiveStreaming::getId);
        lqw.like(StringUtils.isNotEmpty(liveStreaming.getTitle()), LiveStreaming::getTitle, liveStreaming.getTitle())
                .like(StringUtils.isNotEmpty(liveStreaming.getApplyPerson()),LiveStreaming::getApplyPerson,liveStreaming.getApplyPerson())
                .like(StringUtils.isNotEmpty(liveStreaming.getContactPerson()),LiveStreaming::getContactPerson,liveStreaming.getContactPerson())
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingRatifyServiceImpl.java
@@ -43,7 +43,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());
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
@@ -50,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());
@@ -178,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);