diff --git a/.collaboration b/.collaboration index 97a5b824..bd1a95c9 100644 --- a/.collaboration +++ b/.collaboration @@ -2426,16 +2426,7 @@ }, { "ModuleName": "ServerCommand/拉起项目视频会议", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T12:25:02.829969+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\拉起项目视频会议.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/订阅钉钉回调事件", @@ -2447,32 +2438,14 @@ }, { "ModuleName": "PCPage/发起钉钉会议", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T12:20:49.5274373+08:00", "ModuleType": 1 }, { "ModuleName": "Tables/会议", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T12:21:01.7183296+08:00", "ModuleType": 22 }, { "ModuleName": "Table/会议记录表", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T12:21:11.6387748+08:00", "ModuleType": 7 } ] \ No newline at end of file diff --git a/Pages/共用/发起钉钉会议.json b/Pages/共用/发起钉钉会议.json new file mode 100644 index 00000000..423024f4 --- /dev/null +++ b/Pages/共用/发起钉钉会议.json @@ -0,0 +1,41 @@ +{ + "Rows": { + "Count": 45 + }, + "Cols": { + "Count": 60 + }, + "StyleDatas": { + "Types": { + "Strs": [ + "Body" + ] + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//nyH2/fVPrljpQh9LDVH5aCa+l5k1zGMWzDWqKXPMopeVe4Xr4NFiJUI7bmwERiFP/wDDrWESx/QMUIIhkAByxVjKOsuohTIbhIXWkr5k7UtPt0su0f4aotJrBrZV6G9XWy86LxKg7G0Q/ejdvT/otCCuJi0DqiQAcTKsG7XrIDVTBw0ElyGGUTreIkU4ceQ8cJg13dvOiIPWrvwRWrmZZQnxHtg8PBK3oSQb/YchoLuKuAk1uhfeknDHJH7atADVFJygIa5maBwlKGUX3PPas06H0KJWEI0ASYPHeCVtmwGnl8yn1re/qYIUqGiknXCS64ma0CuaNCUFMEM7Vp6Xd954YEUCWF9buWTZ9vlzwK1CRYlQDp5T37dvU66AlWLcaC2bRRQ1wQbqU8ekdYaSdJ4hEhjr+wZ+8hgn2JmgFdgwVSwUIeFzT7U/LBIiv8JUL1+Ur96V5HJq3JdWdrq5UgH2A7DgDxhJ1AwaR65M6crHKmzgd6p8nI8Mu/SCwseF0tJpZM2tvTmHdQPc5tu40jZuxLfm6Si3hWmyGJrmdMwJChGKrdCElgNDXskp+vEwUwz+juiUuKB8E+C3WBYur9MENXoZJbvGSB+AWq6FCPr7GgVMqSZLts4MTxrvJgsnOcM9tksXARL6QW6jnoI6QUNVhZ3JZsqgKT+byOrVeKW7BZQjB2nAzAgNTJcX8HoleBnh8aOYUzDR/h3iYsIZGTEBVF+On+/nLGBT7Mm/c+Q2T11Nr0cLIMsi9SEo7iETzG65bzL8Uk6InwmO6MzG0NaF3EveADSgFmrooOS45LNdbJxSFpJHSBd2F8Yc4YBTe/7z6YQYRCMHVsrtAktU//Rq7HTs78pW8Mq4pZUbn1QJ5+qXZu1bGcVCCIMzoNQAhjoE2Q0k240b3WKiCLaWGw==|920 \ No newline at end of file diff --git a/Pages/共用/发起钉钉会议.rd b/Pages/共用/发起钉钉会议.rd new file mode 100644 index 00000000..47790895 --- /dev/null +++ b/Pages/共用/发起钉钉会议.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 60, + "RowCount": 45 +} \ No newline at end of file diff --git a/ServerCommands/钉钉/拉起项目视频会议.json b/ServerCommands/钉钉/拉起项目视频会议.json index a0dcf8c7..7c74828e 100644 --- a/ServerCommands/钉钉/拉起项目视频会议.json +++ b/ServerCommands/钉钉/拉起项目视频会议.json @@ -48,7 +48,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "2c5d1dbf-6aaa-4930-8be5-1cb779650e0a", + "GUID": "d8f64f0a-97aa-4557-b8a1-587f484116cc", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", @@ -57,7 +57,7 @@ "ColumnName": "项目名称" }, { - "GUID": "64570a32-67c1-4cc3-bef5-787ce3149232", + "GUID": "17e62aba-8ef6-463c-bc04-8085ddaf47eb", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -66,7 +66,7 @@ "ColumnName": "项目经理" }, { - "GUID": "18d01a5b-2efe-4ed6-8ef5-106bc731e480", + "GUID": "6882a52e-b423-48ec-bcd7-1500416270bf", "BindingInfo": { "TableName": "项目表", "ColumnName": "商务经理", @@ -75,7 +75,7 @@ "ColumnName": "商务经理" }, { - "GUID": "68228cf5-4734-4da9-857d-56e5727ac8c4", + "GUID": "30fb748b-5fff-419c-bb79-ae1d47fe0383", "BindingInfo": { "TableName": "项目表", "ColumnName": "客服经理", @@ -99,7 +99,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "e13a4213cf624db4a0dad6f57781f6b5" + "ID": "1b6fc444958341068ee78e57de0486f3" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -178,7 +178,7 @@ "OutParamaterName": "项目成员数组" } ], - "ID": "b551c808-60de-4fb4-8c18-023feaaa2b9a" + "ID": "f8b1d9a4-a8fe-4915-9bad-58953ae3615b" } ] }, @@ -241,7 +241,7 @@ "OutParamaterName": "项目成员数组" } ], - "ID": "4d835e79-35a6-42c3-9309-3535baa9617b" + "ID": "23f76fab-c4ac-43a5-9909-ad996b12b691" } ] }, @@ -276,7 +276,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "4eabe0a25e8e451bb35f4594434b5ea3" + "ID": "541717b1a1534329be707bc7de15f593" }, { "$type": "DingTalkPlugin.VideoConferences, DingTalkPlugin", @@ -294,6 +294,73 @@ }, "Result": "返回结果" }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "会议记录表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议业务类型", + "GUID": "cae0254c-e9a8-4220-9c04-e63034611e94" + } + }, + { + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "钉钉会议ID", + "GUID": "2e441d04-6cfe-4ee6-9475-6c6bfe6f8ffd" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.ConferenceId" + } + }, + { + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "发起人", + "GUID": "0f6bf43e-c1c2-4912-93d5-4288b8bc1e99" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + } + }, + { + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "参与人", + "GUID": "75fe07c6-a505-4397-bb7a-afc7c96f06cc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参会人" + } + }, + { + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议标题", + "GUID": "e335c5ce-aacb-4a25-bbe0-3f168446e436" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.项目名称&\"项目沟通会议\"" + } + }, + { + "BindingInfo": { + "TableName": "会议记录表", + "ColumnName": "会议状态", + "GUID": "e1de7023-6d39-4282-9768-93211d3cde5f" + }, + "Value": "1" + } + ] + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": "0", @@ -303,18 +370,18 @@ "ReturnPropertyName": "会议ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=返回结果.RoomCode" + "SerializeProperty": "=返回结果.ConferenceId" } } ] } ], - "ID": "68140703-58c3-4f4f-a30f-7bfa8effcec0" + "ID": "bde73837-1b59-4db9-8d28-02cc44634b03" } ] } ], - "ID": "9537ce94-7139-4356-8ad2-f89cfc706fa2" + "ID": "12e0cc56-e3d4-4077-8461-d9d4710f6e97" } ] } diff --git a/Tables/会议/会议记录表.json b/Tables/会议/会议记录表.json new file mode 100644 index 00000000..df5b4596 --- /dev/null +++ b/Tables/会议/会议记录表.json @@ -0,0 +1,109 @@ +{ + "Name": "会议记录表", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, + "AutoIncrement": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "会议业务类型", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "钉钉会议ID", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "发起人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "参与人", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "会议标题", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "int", + "MaxLength": -1, + "Name": "会议状态", + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "会议开始时间", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "datetime", + "MaxLength": -1, + "Name": "会议结束时间", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "会议持续时间", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, + "ConnectionId": "业务表", + "SourceTableName": "会议记录表", + "SourceTableSchema": "dbo" + }, + "PrimaryKey": [ + "ID" + ], + "Indexes": [] +} \ No newline at end of file