zqy
2024-05-19 1f5b385ce89c528b8e4f3385dc27a3ae8cb09f24
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
@@ -59,8 +59,6 @@
                .like(StringUtils.isNotEmpty(meeting.getApplyApart()), Meeting::getApplyApart, meeting.getApplyApart());
//                .like(Integer.valueOf(meeting.getApplyPerson())!=null, Meeting::getApplyPerson, meeting.getApplyPerson());
        lqw.between(meeting.getHappenStartTime() != null && meeting.getHappenEndTime() != null, Meeting::getStartTime, meeting.getHappenStartTime(), meeting.getHappenEndTime());
        return lqw;
@@ -214,90 +212,90 @@
            }else {
                newModel.setBy2(dataById.getPlace());
            }
            if(StringUtils.isNotEmpty(String.valueOf(meeting.getConPeople()))){
                newModel.setBy8(meeting.getConPeople());
            }else {
                newModel.setBy8(dataById.getConPeople());
            }
            if(meeting.getPartPeople() == 0){
                newModel.setBy9(meeting.getPartPeople());
            }else {
                newModel.setBy9(dataById.getPartPeople());
            }
//
//            if(StringUtils.isNotEmpty(String.valueOf(meeting.getConPeople()))){
//                newModel.setBy8(meeting.getConPeople());
//            }else {
//                newModel.setBy8(dataById.getConPeople());
//            }
//
//            if(meeting.getPartPeople() == 0){
//                newModel.setBy9(meeting.getPartPeople());
//            }else {
//                newModel.setBy9(dataById.getPartPeople());
//            }
            if(meeting.getApplyPerson() != 0){
                newModel.setBy10(meeting.getApplyPerson());
            }else {
                newModel.setBy10(dataById.getApplyPerson());
            }
//            if(meeting.getApplyPerson() != 0){
//                newModel.setBy10(meeting.getApplyPerson());
//            }else {
//                newModel.setBy10(dataById.getApplyPerson());
//            }
//
//            if(meeting.getApplyApart()!=null){
//                newModel.setBy3(meeting.getApplyApart());
//            }else {
//                newModel.setBy3(dataById.getApplyApart());
//            }
//
//            if(String.valueOf(meeting.getStartTime()) != null){
//                newModel.setBy14(meeting.getStartTime());
//            }else {
//                newModel.setBy14(dataById.getStartTime());
//            }
//
//            if(String.valueOf(meeting.getEndTime()) != null){
//                newModel.setBy15(meeting.getEndTime());
//            }else {
//                newModel.setBy15(dataById.getEndTime());
//            }
            if(meeting.getApplyApart()!=null){
                newModel.setBy3(meeting.getApplyApart());
            }else {
                newModel.setBy3(dataById.getApplyApart());
            }
//
//            if(meeting.getIsPlacebrand() != 0 ){
//                newModel.setBy11(meeting.getIsPlacebrand());
//            }else {
//                newModel.setBy11(dataById.getIsPlacebrand());
//            }
//
//            if(meeting.getConnPhone()!=null){
//                newModel.setBy12(meeting.getConnPerson());
//            }else {
//                newModel.setBy12(dataById.getConnPerson());
//            }
            if(String.valueOf(meeting.getStartTime()) != null){
                newModel.setBy14(meeting.getStartTime());
            }else {
                newModel.setBy14(dataById.getStartTime());
            }
//            if(meeting.getConnPhone()!=null){
//                newModel.setBy4(meeting.getConnPhone());
//            }else {
//                newModel.setBy4(dataById.getConnPhone());
//            }
//
//            if(meeting.getStatu() != 0){
//                newModel.setBy13(meeting.getStatu());
//            }else {
//                newModel.setBy13(dataById.getStatu());
//            }
            if(String.valueOf(meeting.getEndTime()) != null){
                newModel.setBy15(meeting.getEndTime());
            }else {
                newModel.setBy15(dataById.getEndTime());
            }
            if(meeting.getIsPlacebrand() != 0 ){
                newModel.setBy11(meeting.getIsPlacebrand());
            }else {
                newModel.setBy11(dataById.getIsPlacebrand());
            }
            if(meeting.getConnPhone()!=null){
                newModel.setBy12(meeting.getConnPerson());
            }else {
                newModel.setBy12(dataById.getConnPerson());
            }
            if(meeting.getConnPhone()!=null){
                newModel.setBy4(meeting.getConnPhone());
            }else {
                newModel.setBy4(dataById.getConnPhone());
            }
            if(meeting.getStatu() != 0){
                newModel.setBy13(meeting.getStatu());
            }else {
                newModel.setBy13(dataById.getStatu());
            }
            if(String.valueOf(meeting.getCreateTime()) !=null){
                newModel.setBy16(meeting.getCreateTime());
            }else {
                newModel.setBy16(dataById.getCreateTime());
            }
//            if(String.valueOf(meeting.getCreateTime()) !=null){
//                newModel.setBy16(meeting.getCreateTime());
//            }else {
//                newModel.setBy16(dataById.getCreateTime());
//            }
            UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
            updateRequest.doc(
                    "by1",newModel.getBy1(),
                    "by2",newModel.getBy2(),
                    "by3",newModel.getBy8(),
                    "by4",newModel.getBy9(),
                    "by5",newModel.getBy10(),
                    "by6",newModel.getBy11(),
                    "by7",newModel.getBy3(),
                    "by8",newModel.getBy14(),
                    "by9",newModel.getBy15(),
                    "by10",newModel.getBy12(),
                    "by11",newModel.getBy4(),
                    "by12",newModel.getBy13(),
                    "by13",newModel.getBy15()
                    //"by3",newModel.getBy8(),
                  //  "by4",newModel.getBy9(),
                    "by5",newModel.getBy10()
                  //  "by6",newModel.getBy11(),
                 //   "by7",newModel.getBy3(),
                  //  "by8",newModel.getBy14(),
                 //   "by9",newModel.getBy15(),
                 //   "by10",newModel.getBy12(),
                 //   "by11",newModel.getBy4(),
                 //   "by12",newModel.getBy13(),
                 //   "by13",newModel.getBy15()
            );
@@ -360,6 +358,9 @@
    @Override
    public AjaxResult addData(Meeting meeting) {
        System.out.println("-----------------000000000000");
        System.out.println(meeting.getStartTime());
//        ZInfoUser myself = zInfoUserService.getMyself();
//        Long familyId = myself.getFamilyId();
//
@@ -398,17 +399,17 @@
            esModel.setCtTableName("会议记录");
            esModel.setBy1(meeting.getTitle());
            esModel.setBy2(meeting.getPlace());
            esModel.setBy8(meeting.getConPeople());
            esModel.setBy9(meeting.getPartPeople());
            esModel.setBy10(meeting.getApplyPerson());
            esModel.setBy3(meeting.getApplyApart());
            esModel.setBy14(meeting.getStartTime());
            esModel.setBy15(meeting.getEndTime());
            esModel.setBy11(meeting.getIsPlacebrand());
            esModel.setBy12(meeting.getConnPerson());
            esModel.setBy4(meeting.getConnPhone());
            esModel.setBy13(meeting.getStatu());
            esModel.setBy16( meeting.getCreateTime());
          //  esModel.setBy8(meeting.getConPeople());
         //   esModel.setBy9(meeting.getPartPeople());
        //    esModel.setBy10(meeting.getApplyPerson());
         //   esModel.setBy3(meeting.getApplyApart());
         //   esModel.setBy14(meeting.getStartTime());
         //   esModel.setBy15(meeting.getEndTime());
        //    esModel.setBy11(meeting.getIsPlacebrand());
        //    esModel.setBy12(meeting.getConnPerson());
         //   esModel.setBy4(meeting.getConnPhone());
         //   esModel.setBy13(meeting.getStatu());
       //     esModel.setBy16( meeting.getCreateTime());
            //这里存储查询详情的路径
            esModel.setBy5("/zMeeting");
//            esModel.setFid(familyId);