修改了memo代码

feige

2024-04-28 1b0953e72217f63bbc83d15d49afd5f1cb6577f8

修改了memo代码

 zhang-content/src/main/java/com/ruoyi/domain/Meeting.java

@@ -7,8 +7,10 @@
import com.fasterxml.jackson.annotation.JsonFormat;

import com.ruoyi.common.annotation.Excel;

import lombok.Data;

import org.apache.ibatis.type.JdbcType;

import org.joda.time.DateTime;



import java.sql.Timestamp;

import java.util.Date;



@Data

@@ -50,27 +52,27 @@
     * 开始时间

     */

    @Excel(name = "开始时间")

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

    private Date startTime;

    /**

     * 结束时间

     */

    @Excel(name = "结束时间")

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")

    @JsonFormat(pattern = "yyyy-MM-dd")

    private Date endTime;





    /**

     * 开始开会时间

     */

    @TableField(exist = false)

    private Date happenStartTime;

    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)

    private Timestamp happenStartTime;



    /**

     * 结束时间

     */

    @TableField(exist = false)

    private Date happenEndTime;

    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)

    private Timestamp happenEndTime;

    /**

     * 是否摆放水牌

     */


 zhang-content/src/main/java/com/ruoyi/domain/MeetingRatify.java

File was renamed from zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
@@ -1,28 +1,28 @@
package com.ruoyi.domain;



import com.baomidou.mybatisplus.annotation.IdType;

import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;



@Data

@TableName("meeting_ratify")

public class MeetingRatify {

    @TableId(value = "id", type = IdType.AUTO)

    private Long id;



    private int familyId;



    private String useTime;



    private String conferenceRoom;



    private String title;



    private int applyPerson;



    private int ratifyPerson;



    private String status;



}

package com.ruoyi.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@Data
@TableName("meeting_ratify")
public class MeetingRatify {
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    private int familyId;

    private String useTime;

    private String conferenceRoom;

    private String title;

    private int applyPerson;

    private int ratifyPerson;

    private String status;

}

 zhang-content/src/main/java/com/ruoyi/service/MeetingRatifyService.java

@@ -1,4 +1,4 @@
package com.ruoyi.service;



public interface MeetingRatify {

public interface MeetingRatifyService {

}


 zhang-content/src/main/java/com/ruoyi/service/MeetingStatisticService.java

@@ -1,4 +1,4 @@
package com.ruoyi.service;



public class MeetingStatisticesSevice {

public class MeetingStatisticService {

}


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

@@ -214,90 +214,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 +360,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 +401,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);