Merge remote-tracking branch 'origin/master'

feige

2024-06-10 2f432628a460a73f830c278a7d69e8328767a7b6

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

@@ -72,7 +72,7 @@
//        lqw.eq(meeting.getFamilyId()!=null,Meeting::getFamilyId,meeting.getFamilyId());

        lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson())), Meeting::getApplyPerson, meeting.getApplyPerson());

        lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getPartPeople())), Meeting::getPartPeople, meeting.getPartPeople());

        lqw.eq(!StringUtils.isEmpty(String.valueOf(meeting.getConnPerson())), Meeting::getConnPerson, meeting.getConnPerson());

        lqw.eq(!StringUtils.isEmpty(meeting.getConnPerson()), Meeting::getConnPerson, meeting.getConnPerson());

        return lqw;

    }



@@ -115,7 +115,7 @@
    public List<Meeting> selectByCondition(Meeting meeting) {

        //要查自己家庭的

        ZInfoUser myself = zInfoUserService.getMyself();

        System.out.println("================");

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



//        Long familyId = myself.getFamilyId();

//

@@ -185,22 +185,22 @@
        zfLog.setModule("会议");

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

        zfLogService.save(zfLog);

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

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

        if(updateById(meeting)){

            //到数据库中查询对应的数据

            Meeting dataById = getById(meeting.getId());



            //先到es中查询到对应那条数据在es的id

            EsModel esResult = esSer.findByCtId(dataById.getId().intValue(), "会议");

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

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

            if (esResult == null){

                return AjaxResult.success();

            }



            //操作es修改数据

            EsModel newModel = new EsModel();

            System.out.println(meeting);

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

//            System.out.println(meeting);

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

            if(meeting.getTitle()!=null){

                newModel.setBy1(meeting.getTitle());

            }else {

@@ -358,9 +358,9 @@
    @Override

    public AjaxResult addData(Meeting meeting) {



        System.out.println("-----------------000000000000");



        System.out.println(meeting.getStartTime());

//        System.out.println("-----------------000000000000");

//

//        System.out.println(meeting.getStartTime());

//        ZInfoUser myself = zInfoUserService.getMyself();

//        Long familyId = myself.getFamilyId();

//

@@ -414,7 +414,7 @@
            esModel.setBy5("/zMeeting");

//            esModel.setFid(familyId);

            esSer.insertTable(esModel);

            System.out.println(esModel);

//            System.out.println(esModel);



            return AjaxResult.success();

        } else {