Merge branch 'fix/android_meeting_bug' into 'develop'

android 会议字段错误

See merge request o2oa/o2oa!2024

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/meeting/apply/MeetingApplyActivity.kt

@@ -200,7 +200,7 @@ class MeetingApplyActivity : BaseMVPActivity<MeetingApplyContract.View, MeetingA
                 info.subject = subject
                 info.startTime = "$startDay $startTime:00"
                 info.completedTime = "$startDay $endTime:00"
-                info.description = edit_meeting_create_form_desc.text.toString()
+                info.summary = edit_meeting_create_form_desc.text.toString()
                 val savePersonList = invitePersonList
                 savePersonList.remove(invitePersonAdd)
                 info.invitePersonList = savePersonList
@@ -344,7 +344,7 @@ class MeetingApplyActivity : BaseMVPActivity<MeetingApplyContract.View, MeetingA
             info.subject = subject
             info.startTime = "$startDay $startTime:00"
             info.completedTime = "$startDay $endTime:00"
-            info.description = edit_meeting_create_form_desc.text.toString()
+            info.summary = edit_meeting_create_form_desc.text.toString()
             val savePersonList = invitePersonList
             savePersonList.remove(invitePersonAdd)
             info.invitePersonList = savePersonList

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/meeting/edit/MeetingEditActivity.kt

@@ -81,7 +81,7 @@ class MeetingEditActivity : BaseMVPActivity<MeetingEditContract.View, MeetingEdi
         edit_meeting_edit_form_start_day.text = startDay
         edit_meeting_edit_form_start_time.text = startTime
         edit_meeting_edit_form_end_time.text = completeTime
-        edit_meeting_edit_form_desc.setText(meeting.description)
+        edit_meeting_edit_form_desc.setText(meeting.summary)
 
         meetingFileList.addAll(meeting.attachmentList)
         recycler_meeting_edit_form_file_list.layoutManager = LinearLayoutManager(this)
@@ -219,7 +219,7 @@ class MeetingEditActivity : BaseMVPActivity<MeetingEditContract.View, MeetingEdi
             return
         }
         meeting.subject = subject
-        meeting.description = edit_meeting_edit_form_desc.text.toString()
+        meeting.summary = edit_meeting_edit_form_desc.text.toString()
         val savePersonList = invitePersonList
         savePersonList.remove(invitePersonAdd)
         meeting.invitePersonList = savePersonList

o2android/app/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/app/meeting/invited/MeetingDetailInfoActivity.kt

@@ -53,7 +53,7 @@ class MeetingDetailInfoActivity : BaseMVPActivity<MeetingDetailInfoContract.View
         edit_meeting_invited_start_day.text = meetingDetailInfo.startTime.substring(0,10)
         edit_meeting_time.text = meetingDetailInfo.startTime.substring(11,16)+"-"+meetingDetailInfo.completedTime.substring(11,16)
         meeting_people_sum.text = Integer.toString(meetingDetailInfo.invitePersonList.size+1)+"人"
-        edit_meeting_create_form_desc.text = meetingDetailInfo.description
+        edit_meeting_create_form_desc.text = meetingDetailInfo.summary
         mPresenter.asyncLoadRoomName(edit_meeting_invited_room,meetingDetailInfo.room)
 
         meetingFileList.addAll(meetingDetailInfo.attachmentList)

o2android/o2_auth_sdk/src/main/java/net/zoneland/x/bpm/mobile/v1/zoneXBPM/model/bo/api/meeting/MeetingJSON.kt

@@ -19,7 +19,7 @@ data class MeetingInfoJson(
         var pinyinInitial: String = "",
         var id: String = "",
         var subject: String = "",//名称
-        var description: String = "",//说明
+        var summary: String = "",//说明
         var room: String = "",//会议室
         var date: String = "",//会议日期
         var startTime: String = "",//开始日期