zhangshi_app_backend.git

			@@ -8,7 +8,6 @@
			import org.springframework.data.elasticsearch.annotations.FieldType;


			import java.sql.Timestamp;
			import java.util.Date;

			/**
			@@ -106,16 +105,16 @@
			private int by13;

			/** 备用14 */
			@Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss")
			@Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
			private Date by14;

			/** 备用15 */
			@Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss")
			private Timestamp by15;
			@Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
			private Date by15;

			/** 备用16 */
			@Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss ")
			private Timestamp by16;
			@Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor ")
			private Date by16;


			}

			@@ -9,7 +9,6 @@
			import lombok.Data;
			import org.joda.time.DateTime;

			import java.sql.Timestamp;
			import java.util.Date;

			@Data
			@@ -51,14 +50,14 @@
			* 开始时间
			*/
			@Excel(name = "开始时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date startTime;
			/**
			* 结束时间
			*/
			@Excel(name = "结束时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
			private Timestamp endTime;
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date endTime;


			/**
			@@ -95,8 +94,8 @@
			/**
			* 生成时间
			*/
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
			private Timestamp createTime;
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date createTime;


			}

			@@ -201,7 +201,7 @@

			//操作es修改数据
			EsModel newModel = new EsModel();

			System.out.println(meeting);
			if(meeting.getTitle()!=null){
			newModel.setBy1(meeting.getTitle());
			}else {
			@@ -214,20 +214,20 @@
			newModel.setBy2(dataById.getPlace());
			}

			if(StringUtils.isEmpty(String.valueOf(meeting.getConPeople()))){
			if(meeting.getConPeople() != 0){
			newModel.setBy8(meeting.getConPeople());
			}else {
			newModel.setBy8(dataById.getConPeople());
			}

			if(StringUtils.isEmpty(String.valueOf(meeting.getPartPeople()))){
			if(meeting.getPartPeople() != 0){
			newModel.setBy9(meeting.getPartPeople());
			}else {
			newModel.setBy9(dataById.getPartPeople());
			}


			if(StringUtils.isEmpty(String.valueOf(meeting.getApplyPerson()))){
			if(meeting.getApplyPerson() != 0){
			newModel.setBy10(meeting.getApplyPerson());
			}else {
			newModel.setBy10(dataById.getApplyPerson());
			@@ -252,7 +252,7 @@
			}


			if(StringUtils.isEmpty(String.valueOf(meeting.getIsPlacebrand()))){
			if(meeting.getIsPlacebrand() != 0 ){
			newModel.setBy11(meeting.getIsPlacebrand());
			}else {
			newModel.setBy11(dataById.getIsPlacebrand());
			@@ -270,7 +270,7 @@
			newModel.setBy4(dataById.getConnPhone());
			}

			if(StringUtils.isEmpty(String.valueOf(meeting.getStatu()))){
			if(meeting.getStatu() != 0){
			newModel.setBy13(meeting.getStatu());
			}else {
			newModel.setBy13(dataById.getStatu());

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zhang-content/src/main/java/com/ruoyi/domain/Meeting.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史