From 1b0953e72217f63bbc83d15d49afd5f1cb6577f8 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 28 四月 2024 23:19:52 +0800
Subject: [PATCH] 修改了memo代码
---
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java | 173 +++++++++++++++++++++++++++++----------------------------
1 files changed, 88 insertions(+), 85 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
index 71a1057..aa04d1e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingServiceImpl.java
+++ b/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);
--
Gitblit v1.9.1