diff --git a/.collaboration b/.collaboration index 163cb3d9..af416191 100644 --- a/.collaboration +++ b/.collaboration @@ -1940,32 +1940,6 @@ "ModuleName": "ServerCommandPrivate/移除仓库成员", "ModuleType": 27 }, - { - "ModuleName": "TaskScheduler/添加任务成员", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:20:06.7935135+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\添加任务成员.json" - ] - }, - { - "ModuleName": "TaskScheduler/删除任务成员", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:20:18.0199497+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\删除任务成员.json" - ] - }, { "ModuleName": "UserControlPage/Gitee仓库选择", "ModuleType": 31 @@ -2040,16 +2014,7 @@ }, { "ModuleName": "ServerCommandPrivate/初始化填充任务数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:05:09.8080087+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\任务\\初始化填充任务数据.json" - ] + "ModuleType": 27 }, { "ModuleName": "UserControlPage/Git提交记录单块", @@ -2125,19 +2090,7 @@ }, { "ModuleName": "PCPage/任务管理", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:53:57.8817042+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务管理.json", - "Pages\\任务\\任务管理.rd", - "Pages\\f5fc8d78af50450e9ecd5e29f22c67b.json", - "Pages\\f5fc8d78af50450e9ecd5e29f22c67b.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务审批", @@ -2165,17 +2118,7 @@ }, { "ModuleName": "PCPage/任务管理_列头", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T17:55:49.0430295+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务管理_列头.json", - "Pages\\任务\\任务管理_列头.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Tables/TODO", @@ -2255,16 +2198,7 @@ }, { "ModuleName": "TaskScheduler/任务表更新事件", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:15:21.3910726+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\任务表更新事件.json" - ] + "ModuleType": 16 }, { "ModuleName": "ServerCommands/TODO", @@ -2288,22 +2222,10 @@ }, { "ModuleName": "TaskScheduler/任务成员表变更事件", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:20:06.7935163+08:00", "ModuleType": 16 }, { "ModuleName": "TaskScheduler/任务成员表删除事件", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T18:20:18.0199524+08:00", "ModuleType": 16 } ] \ No newline at end of file diff --git a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json index b31dfa9a..d06b944f 100644 --- a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json +++ b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.json @@ -60,7 +60,12 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 126.0, + "DesignLengthInPixel": 200.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 200.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -70,19 +75,6 @@ } } }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 191.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 200.0, - "Unit": 1 - } - } - }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 191.0, @@ -124,30 +116,42 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 23.0 + "DesignLengthInPixel": 191.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 200.0, + "Unit": 1 + } } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 74.0 + "DesignLengthInPixel": 23.0 } }, "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 74.0 + } + }, + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } } }, - "Count": 12, + "Count": 13, "DefaultSize": 191.0 }, "Values": { "1,3": "任务名称", - "1,4": 0, - "1,5": "正常", - "1,7": 0, + "1,6": "正常", "1,8": 0, - "1,10": "报工" + "1,9": 0, + "1,11": "报工" }, "AttachInfos": { "1,1": { @@ -210,7 +214,7 @@ "ParamName": "任务ID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=f5fc8d78af50450e9ecd5e29f22c67b!E4" + "SerializeProperty": "=f5fc8d78af50450e9ecd5e29f22c67b!F4" } }, { @@ -261,7 +265,7 @@ } } ], - "ID": "4934ffd9-6d66-4ec9-a964-939c5f54d67a" + "ID": "63d1a33b-41f5-4bb2-958b-b9e0d58cb594" }, { "CommandList": [ @@ -276,12 +280,12 @@ "BtnText": "知道了" } ], - "ID": "24b173a4-cb76-4c5e-88c9-206fe957dffb" + "ID": "525905e3-adfb-456c-855e-426a9d4620fb" } ] } ], - "ID": "2aea920e-3aeb-4dd6-9506-880937ca4502" + "ID": "3514ad49-a0e8-49e1-964d-572b55d5d3ac" } ] } @@ -295,7 +299,7 @@ } ], "Comments": "小于进行中", - "ID": "59487c25-cf0d-4574-9952-74e63edac9e0" + "ID": "e584291d-1cae-45a2-ba05-2987288150ae" }, { "CommandList": [ @@ -305,7 +309,7 @@ "Message": "任务尚未审批完成,不可修改状态" } ], - "ID": "e0bdc4a6-a84f-4514-b0a1-a76df6fda5a3" + "ID": "e5879b3c-d143-4241-b01f-d5d3348f85c4" } ] } @@ -324,20 +328,53 @@ ] }, "1,4": { - "CssName": "ec-label", - "TemplateCellSource": "任务说明_单行", - "RulesGuidList": [ - "9d799cd1-2d7e-4f4d-be80-7628b7c86dc0" - ] + "TemplateCellSource": "工时分配方式" }, "1,5": { + "CssName": "singlebox", + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 3, + "PrimaryColor": "Background 2 -10", + "SecondaryColor": "Text 1 0", + "IsBounding": true, + "DataSource": "用户信息视图", + "ValueColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "f42319a4-6ad4-474d-bd7b-4bdf4de61be0" + }, + "DisplayColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "701c2c56-4b52-4485-ab07-c545ad9dddca" + }, + "ItemsQuery": { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "f5805362-32e1-453b-b13e-a958ee41d494" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=f5fc8d78af50450e9ecd5e29f22c67b!F5" + } + }, + "CommandList": [], + "ReadOnly": true + }, + "TemplateCellSource": "任务负责人" + }, + "1,6": { "TemplateCellSource": "逾期状态", "RulesGuidList": [ "b8253a56-7b38-44cc-bb95-a30e009e05d9", "9d799cd1-2d7e-4f4d-be80-7628b7c86dc0" ] }, - "1,6": { + "1,7": { "TemplateCellSource": "动态可核定工时", "RulesGuidList": [ "ae873111-fde0-4fa1-b664-852d3e833eff", @@ -346,19 +383,19 @@ "9d799cd1-2d7e-4f4d-be80-7628b7c86dc0" ] }, - "1,7": { + "1,8": { "TemplateCellSource": "日期范围", "RulesGuidList": [ "9d799cd1-2d7e-4f4d-be80-7628b7c86dc0" ] }, - "1,8": { + "1,9": { "TemplateCellSource": "项目", "RulesGuidList": [ "9d799cd1-2d7e-4f4d-be80-7628b7c86dc0" ] }, - "1,10": { + "1,11": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -428,7 +465,7 @@ { "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=f5fc8d78af50450e9ecd5e29f22c67b!E4" + "SerializeProperty": "=f5fc8d78af50450e9ecd5e29f22c67b!F4" }, "TargetCell": { "SerializeProperty": "=新增报工!任务ID" @@ -438,7 +475,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "00dfe962-e6cd-451c-ba60-e11359034f5b" + "ID": "8eef7554-18f8-420c-b31a-f75d7b39f606" }, { "CommandList": [ @@ -448,12 +485,12 @@ "Message": "你尚未成为该任务参与人,不能报工" } ], - "ID": "a708a927-023b-46d6-a71b-8fa40ce21081" + "ID": "b67446ba-bfc0-459c-b2ab-64a8ec21cbab" } ] } ], - "ID": "1e5e26d7-b42f-465e-b307-5e6ae6092ac6" + "ID": "f079151b-2bbc-4a78-81c7-cdb86d8f27a1" }, { "CommandList": [ @@ -492,17 +529,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "003f5df7-5663-4d3c-823b-cd113ff5e92a" + "ID": "0726d18d-5f24-4fb3-aa21-bfdb44b384f0" } ] } ], - "ID": "c7f323ad-efa5-4933-92a3-693c43f6cef7" + "ID": "0148740a-5e6c-4b37-99eb-de877dd5dbe5" } ] } ], - "ID": "02138fa0-01ef-4eb5-b4f4-991b4b6cf0f5" + "ID": "47d6ef30-f014-4545-b23b-92770c57ec3c" }, { "CommandList": [ @@ -515,7 +552,7 @@ } } ], - "ID": "8be6bde0-cd82-42c3-be81-626d7a4e3c86" + "ID": "cb30580a-3762-4758-9958-6e76e0a5bb2b" } ] } @@ -530,8 +567,11 @@ "3,3": { "TemplateCellSource": "任务状态" }, - "3,4": { + "3,5": { "TemplateCellSource": "ID" + }, + "4,5": { + "TemplateCellSource": "任务成员" } }, "StyleDatas": { @@ -543,44 +583,48 @@ "FontSize": 12.0 }, { - "FontFamily": 0, "FontSize": 13.333333333333332, "Foreground": 1, - "Formatter": 2, - "HorizontalAlignment": 3 - }, - { - "FontFamily": 0, - "FontSize": 13.333333333333332, - "Foreground": 4, - "HorizontalAlignment": 3 - }, - { - "FontSize": 13.333333333333332, - "Formatter": 5, - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 }, { "FontFamily": 0, "FontSize": 12.0, "Foreground": 1, - "Formatter": 6, - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 3, + "HorizontalAlignment": 2 + }, + { + "FontSize": 13.333333333333332, + "Formatter": 4, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 12.0, + "Foreground": 1, + "Formatter": 5, + "HorizontalAlignment": 2 }, { "FontSize": 13.333333333333332, "Foreground": 1, - "Formatter": 7, - "HorizontalAlignment": 3 + "Formatter": 6, + "HorizontalAlignment": 2 }, { "FontSize": 13.333333333333332, - "Foreground": 4, - "HorizontalAlignment": 8 + "Foreground": 3, + "HorizontalAlignment": 7 }, { "FontSize": 13.333333333333332, - "HorizontalAlignment": 8 + "HorizontalAlignment": 7 }, { "FontFamily": 0, @@ -591,7 +635,6 @@ "Strs": [ "Body", "Text 1 50", - "\"💬 \"@", "Left", "Accent 2 0", "\"⏱️ \"@\"小时\"", @@ -601,8 +644,8 @@ ] }, "CellStyles": { - "0,4": 0, "0,5": 0, + "0,6": 0, "1,1": 1, "1,4": 2, "1,5": 3, @@ -611,14 +654,15 @@ "1,8": 6, "1,9": 7, "1,10": 8, - "2,4": 0, + "1,11": 9, "2,5": 0, - "3,4": 0, + "2,6": 0, "3,5": 0, - "4,4": 9, - "4,5": 9, - "4,6": 9, - "4,7": 9 + "3,6": 0, + "4,5": 10, + "4,6": 10, + "4,7": 10, + "4,8": 10 }, "SheetStyle": { "FontFamily": 0 @@ -729,4 +773,4 @@ "PaperSize": {}, "Margin": {} } -}//YaxaFaxIm0MGe67XiyQot0fg2M9KNwCjWxq9hC1IlYyUD132AddZnzdHXqDY7/BucBYyDAxV13uBJh0as4QtWDI0pnt5GiI1SrzqmAe2NqE6Y4QmbTqsEQcueOIoVnjW99axP/kauoaouYpncxM/LoC1P1h0qgW7B5JtQot1A48Hfk8i0qug+IgayHwTCRcq7nJnfjUIPj3SbWCFYkF2B5xwHyGIwnwOL+SFfWeOsSAk0WuUytHgO47I2rDv3b68oxnyrTBGT+pr22oVgfTus3c1icb/ZP8oYELc07ROk2lUFHJAFBMrvOg41cf9b1B7zaYw0CznlI4wEKtf7v9o2PqQEtha+aMop6xe88oEaCfQzXc4vXPQZ6ZTQZ5DoCeavi6dDK3/2moKs3Bbjje0MLYyib2RlX901BVSoMBy0EytT9GC+dCjmZ8ZS3WVIHP3m8a7b6DTY9H9aEYT9wFRiiJInufcLvr5F0wC1WbulMGcn42mSUlfQfPrvHThQ7SS86wJ7bKQFjI0bhu2al47vasZPqlUmPC/6kfMtYHruNIwrygH4vZ/47JGg3X3Zs5dab1gOb45th+YuMZlOEuVAI5ZnpyTW6nxKSXpDOpIIZSCXZ2HuuEHximmHJs3DztrVv5kHVOI5U4pYbsAO+yPPmHncUIiQGJ6a76FUZWDTwJ4ueTLXotLokc3aYvzVsQjV1lngFHPKesPq+qsktdt17QIorHJbwHrqZFaOMmarOSlMFvXweE02Z/dBKMjF1gHd/ftf3kgh+xF4HE2NEPIIX3OI2teaJwAB5U8mf3ydFsTOx7Wq4An2fpRVnLagYOa0kvWKodemnFRhXGzJUUXShyhbt5x2FC/Xqt3/CysAZupRHb9LwGnzyninuXeU262Ujl7KLDYKOmJawZtMBzM9w==|920 \ No newline at end of file +}//q9CF0hdn9w4YhsC+6XTTUiifJwiIyct72aV+pEcbquszhvT7RkB3m4hdFZHbmRjaEeEhYQKjOYvCS94BYcDlFUcBKmsIiUcPI9I0fKRG/yPWRsibsAayJ8BKGt+WoCqB0/DgJZgsjaG6CCk5PsHAidq4oxgOxLY50H5bAvlmgBNOLaPbwSXTgYTpDofPulOxEP9zzD9VjyGtMdWyJDR7DThrTrHq3IiFdNN7OiCIq7aEs/b1Y7cZisyAYGTKhw0bK4jzZrqxh3G1R7Xn7ZcrwyYAz4X43CvHkNGwQjeRabQi46B58DbzQe+OGUlaKe4G2swGaY5t5hM9EI336NC4xyKFwX+xhPGMAwOsQMygS1Fd4KcyGgNVyUND0TTAVcqjaxiqJFJic/NwfFW5AECGPDyRC0b2V79wZQxAhhWu5YGnh5NlqooNexgd8j8huA0FPpJNCUJ1S9zI0M8Za/WH96+2JqcPVGhCnBh1X551TyAKD4vC4aeSVdg/Io5DVgngcf6s/RzV1aSZX9XiurdAuK6pH+zwGzGionzYTOz5sb5diw+xAjb5pWcIJAU99w88kI4RALCyAPNGZXolSh31Yc81LpLiQ+dqLXIbwifQa3X4bD3etCpcE72VPCHuAePSFQNuBfNUtkY1vXuiMm40mR2XN9YJLTQ3/aTPvYcawDlhb4/orAjzKTjQ39OZZcsCcLzGfv9auDfUnP57pAzugaGwvlXSdjNEBCD+mystfhOg/juRtIkEdFH7o8BPebrR75AJjj5esZoSHfa7gxTMtERQ9F1si4lJqNn5Rs9lSgUQnoPY1ByTbvsHfo/D0up5ApqNKiT35xk5lwQUYsPiBr74wwadD5RmhLKKQkxgmhoVqdQRXfa4r9+T258DXllV5S3BrhLtcRBMjoZjmBt1Qw==|920 \ No newline at end of file diff --git a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd index c6fa304c..f0d38244 100644 --- a/Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd +++ b/Pages/f5fc8d78af50450e9ecd5e29f22c67b.rd @@ -1,5 +1,5 @@ { "PageType": 2, - "ColumnCount": 12, + "ColumnCount": 13, "RowCount": 5 } \ No newline at end of file diff --git a/Pages/任务/任务管理.json b/Pages/任务/任务管理.json index 57abf2b7..e5e320b7 100644 --- a/Pages/任务/任务管理.json +++ b/Pages/任务/任务管理.json @@ -571,7 +571,7 @@ } } ], - "ID": "2d3ab858-feca-46d5-bbf6-53c48d8374eb" + "ID": "2923cdc3-ee36-4345-87c9-8492e1e6f55a" } ] } @@ -766,7 +766,7 @@ } } ], - "ID": "7cf67eb8-1d28-47a6-8673-23aa22eee538" + "ID": "27f321b7-fdf5-4f1c-ad94-4a7b45e17d2f" } ] } @@ -1405,6 +1405,25 @@ }, "ColumnName": "项目" }, + { + "GUID": "b3f92bf1-0cbf-4a85-b105-de4d4a700604", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "c7d08b04-461a-441d-a9a0-3cfffc9eebda", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "工时分配方式", + "NextRelationBinding": { + "RelatedTable": "工时分配方式", + "RelatedColumn": "ID", + "DisplayColumn": "分配方式" + } + } + }, + "ColumnName": "工时分配方式" + }, { "GUID": "63bc694a-a919-446a-b306-462d4d589387", "BindingInfo": { @@ -1494,6 +1513,24 @@ "GUID": "cd835e42-9748-4f29-a3a7-30708a6692bd" }, "ColumnName": "动态可核定工时" + }, + { + "GUID": "163bb028-adf7-46c0-a833-10dabccbd30e", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务成员", + "GUID": "76b9d065-6a7c-43c2-bf11-3dee83d605d6" + }, + "ColumnName": "任务成员" + }, + { + "GUID": "38eb7504-5fdf-4f19-85b9-9ca0dfe638ee", + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "任务负责人", + "GUID": "31426a6d-9c7e-4675-b16a-b160b22f5f3b" + }, + "ColumnName": "任务负责人" } ], "NullFormulaValueQueryPolicy": 1, @@ -2072,4 +2109,4 @@ "Formula": "任务管理!$E$8" } ] -}//3+AexadQKVEcvz/iwC8zoCURhIDas7IrBexR28m8qJ8Y8Z0uQy881ijo1Rfv3kkfPPRyc0Bkwog1d8z0qciPu7EY853Ux9Uv1s64OaBbjtlfU6CI0l8c7Bu90DeZMitArrxUu9fmU7fBBErJl6yCXwCsH4Qug42HPIb///JES2Q9YVQ+1+QKTAozhxQQexdDwIwpVdRm91zq7apjPGM2D7Z/qEMfzy6GHESSHbMD6zqcdSryha83c/Q1t4xI565m6LDZrA/8xYZfp6s+t6PGhtP8I9nIaWQm0az6/HY2IMyLd/sNfpPJOmaL2Cci3PKrwWCJn+24Fg7febB/e5n1zH4x7gZ9Wfa9Z8T7478+31B3RqmuOnBrybr1qeVbKR5to31uUgqUwe5t8tkx/vH1knBuF6Qwp+5KZ070HXCUQgbd6f2iGM7dgP/VPVeRu0uEZLCmzyaH2Ii2ypgwtPw99YJwx+3CnIgY0UA/m8xGlfVSWW63EI0gFHUSTzKYkt+OuYLj2FLFYuSeqbBFHU001GRNaRE16H1d2Z3KlE+pANK6OwWB4uSbFr0v32hKUmPAV48kdEWri/ZuRJVMiK2/81WUA7pMHyzBnsP1YPUX1yqGRkVQ863nz0le5Aq2axnCRCLW6B4i9GMRwQ7Ahqp7NOOw9hlrXhh2q+4jp9P/gtjTe6B+TqXjX/TFGJhcY08rF+ovd6aVqYxQ2+36EtsFA4Inq/uNw/J2e4cavKN/7j/5x1TAAf6RdM3/fgZcmrWenCzP2EH3OGJJ/Owuih97Q8Rw4pn2Pbuoixx3GE+LppKqySOwsIPRySIKqB0FJ2y32cpFpcSMpFscLD5HZBKwZbvmPVSg3IOr0KFw+chfVPCvSW/qt7oXZeV53EIIlDAxWvTq9PAEzLUaQ2/gM6AZWg==|920 \ No newline at end of file +}//7O4WD0EidAuMKYM1r4d6M3/oFc6eiQrrawRyxhYw5UE5IIW8ZsPXXcrCfpitgtZkJXmwHxp82w5W+/bsZncTM0yl4aoktkzZNc3KQEdj2VZhK9qO/aWPaCgnHG27UqOCXClyfLhngQ9pMmJx9aQ0uZHtKlIta7TB1hLre1qDpD+EHOPwhm/PnMCGomys5llHb/FBUBtRyDHE3ILyfm2rb1nbKXCvENO/zORfu3q1cIBj1lSmJ5VQ1WSneVptT7wSoANlMT1PFCvW1VLy6u43ZDkgzvvmg47Jnq8Y71od0V2YNdKDfG7hjLJXD9pmUiHpuZrSRYs3De24bqjzw77AZshnqxMWnWdE6Kn+lWrmKJn1ksTii28AW9H6oQxd9m+9BQyuRx1ih/fWPXcOcLMliqkMhPzVzkZ8Xhb9LvZzaRlvYEjeUTr4SiUof+99MZ/hX2O04y+wZyDi4Gwuse76M+Rzx/PYPsmcnDdOGy14aSSuNhcXT9dUjEkhKA0LaxyWtwt2y7beLOBrjla3kWEfnPoTaBKWOvfsZKJ4ceFu0YVe+nW/Ns5meoxT4j/0qdakkqSRU556iA4UKANtyk+f9HIaddkdIFWC8J3VmfOqCPCozL0YAIFG2Z+c/etICODaXQHN6jOm4WJTsjeAdaOcbu3l2rJvtoRQ/gXZJ0lgYhJMi67JAv4uXI+nUn/HAjOxcGyX7s/d3pbJCAF0dwNZpkLXR1KokM+uX0d+RfffQO4F91zc2BZaIIjDrMrUIqTDuTEEnb/xJW0uiqJNlO/Q9EcKZTiv8Vn+nqrTICj5ZrsqLDvsuSucZW4RfslLRgme97/QCprjPO/vaqNeD705HnB6mveJWL1ivSrQUQuNFkLPMPxevW5qStne1XFYP4oBcPZGq3aXumLJ6deo5ylzdQ==|920 \ No newline at end of file diff --git a/Pages/任务/任务管理_列头.json b/Pages/任务/任务管理_列头.json index 625dbd1b..9478189a 100644 --- a/Pages/任务/任务管理_列头.json +++ b/Pages/任务/任务管理_列头.json @@ -41,7 +41,12 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 127.0, + "DesignLengthInPixel": 200.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 200.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -51,19 +56,6 @@ } } }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 202.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 200.0, - "Unit": 1 - } - } - }, "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 202.0, @@ -105,32 +97,46 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 23.0 + "DesignLengthInPixel": 202.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 200.0, + "Unit": 1 + } } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 75.0 + "DesignLengthInPixel": 23.0 } }, "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 75.0 + } + }, + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } } }, - "Count": 12, + "Count": 13, "DefaultSize": 202.0 }, "Values": { "0,1": "操作", "0,3": "任务", - "0,4": "任务说明", - "0,5": "到期状态", - "0,6": "可核定工时", - "0,7": "任务日期", - "0,8": "所属项目", - "0,10": "报工" + "0,4": "工时分配方式", + "0,5": "任务成员", + "0,6": "到期状态", + "0,7": "可核定工时", + "0,8": "任务日期", + "0,9": "所属项目", + "0,11": "报工" }, "StyleDatas": { "Styles": [ @@ -155,7 +161,8 @@ "0,5": 0, "0,6": 0, "0,7": 0, - "0,8": 0 + "0,8": 0, + "0,9": 0 }, "ColStyles": { "1": 1, @@ -167,7 +174,8 @@ "7": 1, "8": 1, "9": 1, - "10": 1 + "10": 1, + "11": 1 }, "SheetStyle": { "FontFamily": 2, @@ -209,7 +217,7 @@ "Fill": "Background 2 0" }, "IsAutomaticFill": false, - "Size": "1423,30" + "Size": "1696,30" } ] -}//eZxgGt2q3usrpJrEsCuS9/sptSfGt8iOBQn0fKJBDriW3bqgrYp8yWCfjoa96t2HujMyvPCK5XvYexIorX/NKsK+mEIodBTVjcFcImHmwk6/mPoP2Pp9xspVqHVv2f/Ejv/QH8bAqq26FEnub2eJoIsGj5bdZi+0LG45uB+kRIh28vuv1l1COvLbTrODz0vsXgBjJSVfJbjtGU7HPT6cEXBoWfTlE37X9lrg7cQ8309eM6+hueHYWBkm9cUKYQ24+ZVxr3cdMSsIzM54jw6NGHlSnoqjGnLLg4qkTiXDhbMsiz/xCUWkF+mHtpJomcHZxQGUHNiVN1ju0nHAgPoW/UNdn1Ss8gjQGOwCKzkBR3ABXwPVRMEbuID1EdzdBOLcoXMaSkpkwk67fAmzM49n/Yoxkli3fG/kn3iNRYxUj3bquCsyQBu0ZKS70zwhxG34jj9GClwVMn0RNaNSFpi5fLT95SHD5bu2wHeU7FL/iQzTKVAR0xZPxm281Bmsx9RlO6IgHgPZ2Mzqkfasekkd+wbZt8mL8+30jMb7UCBmUy7yboY9C+EDWx1BP3mD+Mf93QxuXovq05BfMUQfWLq64KrUIQrDZAHPZdy6356lIxBPmXlqIIQrJuwIPC685IVCVDc1z6fBoPu07V5yLiR9k+s7MZo9uRT/XjWOFzHJLH3IKnHzOeVy9kHfmkiTOa3UVxrehvSg4gQp3VXVF+0n8wgzxRN1oyuj2bMEr/XZLEGKS91wXwanq6xan+oYavQtn9AONW0TwABuywX4QHtOBLgQ8lnblJuNST1C0TZ85K6qe+Lz6kUpwTnfxzCXo5VGJqdASEfedkZEVGexfGqrf9pDHdDDFI/8eDxRHN+iMt1dJW//AYhCfTUDRH7iBc9N58azC+v02DOe5nxfgBkV/g==|920 \ No newline at end of file +}//mI8vVENMmJfsqEk+7mGRNNT1NA2Dbz0oiQqe5cBiOTEOSpRCQW3OimDJ7RC383yjvTE5LGfUNYu2RxHtrofT+/I0c1u3a/ssyqtiD/nHA0y3o/laEQ2qcuZXE2cUVHTEbaNL4wIwOU8WY2h+pMi1W710sQgYKzcPYAFyniqKht6bs+wH0XyqOH8tAi97FNi7yu6yu4SowmgPkX0ITSEarFCRv2O6MvwYY6udCNG5yTylWSfmOQ/SpuO1CGhUxHY8GC9wmHTxyWARJKKmM09tk1oJPWQlDBKdYJ0LL2wVoVnioROF3gYlLHk2QF46T71ciBK95A379S8a6uYG1jvliClHywGht3kZ35yUa0ZAkq052vbdXRik+UWuaqRO3iUarfqr9cOcf1SfMJbik097J1XC3qX8Y0QEKLlwglZh1/M+Rx80jbJKekibE9ahkHlLQFZRhx1a6Dsy5t0gEd7kbxVgftQw8aOnyVAxNhzgQKLXEqAjrcUOawrXqocJ3U0jv0HtlHSfDrRk/IPo/7EoEmdGnq34QOuXIVGPKfCqimY7ydfc/6OnLufFtvgtoe3iTelVdXpXge7A4P+oxOuwLX3fhplcQDMdXD7dKz8/i3eHOaOYFS5YaXXCkcUyVmkxqx0/k6440Md2PuokeVkuxXu9Gik0mh+ZGlIOIy/kit2jbugbqH0PAm4WgaCwEWvf6gsv7M5UOnpQZWQp+HQ3P4V3a6SmWhZ0ffyM8Uz75ybS3mo4RxAxhQxD+U+Hi8cRT2hIDW82wd5/mSBUEb+PIcCdpa2cTjWshJxBAZg2osnwYgmU8MyPwm+zAYc7KHxbXVF/6JRGn3Tto7987harZQZg3AaZ+IO0eKUThSTD89r42we6S234YuJ2shj34ncxTG2jjmrzqstv55efKUmD2g==|920 \ No newline at end of file diff --git a/Pages/任务/任务管理_列头.rd b/Pages/任务/任务管理_列头.rd index 91f35921..c19de1bd 100644 --- a/Pages/任务/任务管理_列头.rd +++ b/Pages/任务/任务管理_列头.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 12, + "ColumnCount": 13, "RowCount": 1 } \ No newline at end of file diff --git a/SchedulerTasks/删除任务成员.json b/SchedulerTasks/任务成员表删除事件.json similarity index 97% rename from SchedulerTasks/删除任务成员.json rename to SchedulerTasks/任务成员表删除事件.json index 0d54a58d..56e22f56 100644 --- a/SchedulerTasks/删除任务成员.json +++ b/SchedulerTasks/任务成员表删除事件.json @@ -1,5 +1,5 @@ { - "Name": "删除任务成员", + "Name": "任务成员表删除事件", "Enabled": true, "Triggers": [ { @@ -219,7 +219,7 @@ } } ], - "ID": "51337041-0f56-4b56-9763-a5d4a7272c98" + "ID": "a8d00552-4c6b-4c7f-a673-7d3ddcc502d1" }, { "CommandList": [ @@ -229,12 +229,12 @@ "Message": "尚有其他任务中加入该仓库,取消移除" } ], - "ID": "4e23ca46-d655-4f92-8bc6-8e8b7c1f3c8d" + "ID": "011951d6-8a06-4c58-b21b-c905437bbc5f" } ] } ], - "ID": "f4acecd3-cf02-455f-9887-1f593780beae" + "ID": "85f4a110-cea4-42bc-ad70-4ded551aefb1" }, { "CommandList": [ @@ -244,7 +244,7 @@ "Message": "该任务版本未绑定仓库" } ], - "ID": "24439c9f-27e9-4083-9d26-b6196c43a11d" + "ID": "9e1611d0-c761-45ae-b94f-f944e52bdc46" } ] } diff --git a/SchedulerTasks/添加任务成员.json b/SchedulerTasks/任务成员表变更事件.json similarity index 97% rename from SchedulerTasks/添加任务成员.json rename to SchedulerTasks/任务成员表变更事件.json index a785b718..56ab6290 100644 --- a/SchedulerTasks/添加任务成员.json +++ b/SchedulerTasks/任务成员表变更事件.json @@ -1,5 +1,5 @@ { - "Name": "添加任务成员", + "Name": "任务成员表变更事件", "Enabled": true, "Triggers": [ { @@ -127,7 +127,7 @@ } } ], - "ID": "6ac8bfb6-d2ff-4dee-905e-0a137c22ee31" + "ID": "36a9ac18-8ce1-4282-a85d-d1e3ee61156e" } ] } diff --git a/SchedulerTasks/任务表更新事件.json b/SchedulerTasks/任务表更新事件.json index 775c50e5..769e6b3c 100644 --- a/SchedulerTasks/任务表更新事件.json +++ b/SchedulerTasks/任务表更新事件.json @@ -30,6 +30,41 @@ ], "OutParamaterName": "任务负责人列" }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "184bd238-f1e9-46ea-a7be-774190ae3fa4" + }, + "Value": "任务表更新事件" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "ce51b8d9-a10e-4c6c-82ef-f7676b1d6b2b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务负责人列" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "c2105bcb-0f6a-4b9b-a80e-16aa70e207c1" + }, + "Value": "调试" + } + ] + }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", "ConditionAndCommandPairList": [ @@ -101,7 +136,7 @@ } } ], - "ID": "cbfaf714-5c0b-4c99-93ec-45a6a09ae78a" + "ID": "67db1397-b4d9-4990-aa21-2e3451308fc4" }, { "CommandList": [ @@ -111,12 +146,12 @@ "Message": "负责人无变更,忽略" } ], - "ID": "84c1b545-9cb0-44d9-8307-06d78288f848" + "ID": "f7355bbe-e8a8-4717-817d-a9b30e992f42" } ] } ], - "ID": "7f59f804-a89e-430f-9e20-4fd1c49c4323" + "ID": "d78d4173-3938-4cce-b8c6-d4c09b8ed286" } ] } diff --git a/ServerCommands/任务/初始化填充任务数据.json b/ServerCommands/任务/初始化填充任务数据.json index 5914ee94..cc7bf36a 100644 --- a/ServerCommands/任务/初始化填充任务数据.json +++ b/ServerCommands/任务/初始化填充任务数据.json @@ -23,7 +23,25 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "91f87b24-b074-4377-85af-0ce3a70290e7", + "GUID": "fa80dc44-4dbb-46a5-818f-c5eace93b52e", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "99f0fee8-e0f3-48ad-b4cb-56767ada0f75" + }, + "ColumnName": "ID" + }, + { + "GUID": "ccd4d0f1-68e6-4e06-836c-46ee1cb14116", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "4d22167b-0d0c-48de-9d37-e6e850c943e0" + }, + "ColumnName": "任务名称" + }, + { + "GUID": "59e8d52c-a716-4205-91f9-bfe3dc60c55c", "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", @@ -32,7 +50,7 @@ "ColumnName": "项目ID" }, { - "GUID": "419da719-9510-441d-80cc-4ee11afff767", + "GUID": "61395d0f-6f4c-4347-9f43-5bf3c5703594", "BindingInfo": { "TableName": "任务表", "ColumnName": "任务负责人", @@ -41,7 +59,7 @@ "ColumnName": "任务负责人" }, { - "GUID": "2adf5ff9-eb3d-4034-ba1a-b8e6e07dab95", + "GUID": "41ae5c6b-462d-4134-a717-7d62e4ad5e80", "BindingInfo": { "TableName": "任务表", "ColumnName": "FGC_Creator", @@ -65,7 +83,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "6e987fc3b65147938edbce374b633fb9" + "ID": "2cdd4639b4f049cbbb01195301a32385" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -102,43 +120,103 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务成员表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "项目ID", - "GUID": "36c3d1cc-3690-4afc-8177-b12641d9ab8b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务.项目ID" - } + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "检测是否已是成员", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "be9bdab1-bfd0-4426-94bc-681301098045" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务成员", + "GUID": "f2659ec4-d47a-48ea-a8a4-bc590a695dd3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务.任务负责人" + } + } + ] }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "e3d8b191a3e34b89afcfc7da561b8a9a" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "faca65dc-c031-453d-a5c5-0cb188d381df" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=检测是否已是成员" + } + }, + "value": "0" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ID" - } - }, - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务成员", - "GUID": "97b2d16a-cadb-469d-8384-e083836f69d2" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务.任务负责人" - } + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目ID", + "GUID": "942b47f1-2951-4b4c-a8f3-3e11401788e1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "26adae20-4ba6-444b-b65a-21e72f4d53d6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务成员", + "GUID": "55d5aa21-6c08-462a-a7dc-7570ec21c6b3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务.任务负责人" + } + } + ] + } + ], + "ID": "3d88c8a5-236b-482c-b950-87e34dc0cd65" } ] }, @@ -163,58 +241,118 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务成员表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "项目ID", - "GUID": "253894ad-5983-4e92-9989-ee208aaf15c9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务.项目ID" - } + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "检测是否已是成员", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "d0fa004b-b5ec-4b97-ba47-47fa8503adef" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务成员", + "GUID": "f2659ec4-d47a-48ea-a8a4-bc590a695dd3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务.创建者" + } + } + ] }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "fc2da484a7cd476ea97d471e6c24be2e" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务ID", - "GUID": "bd4be969-2724-4c5c-a4a6-51406fdf4d33" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=检测是否已是成员" + } + }, + "value": "0" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ID" - } - }, - { - "BindingInfo": { - "TableName": "任务成员表", - "ColumnName": "任务成员", - "GUID": "6d96f870-c7c3-45c8-9e50-7040600cebcf" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务.创建者" - } + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "项目ID", + "GUID": "1cf6bbeb-8e96-47bd-b4d5-56eee8560d4c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务.项目ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "05b0a91c-da6f-48de-ba43-40d53135f424" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ID" + } + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务成员", + "GUID": "29297a84-17bc-4b2e-8424-51549229d092" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务.创建者" + } + } + ] + } + ], + "ID": "8516038b-dbdc-4100-b32c-e03c62d262ba" } ] } ], - "ID": "780ca6cd-8476-4c45-959c-33e002b99495" + "ID": "c12d3a27-35ea-40f8-b403-3af2596ec725" } ] } ], - "ID": "6ae7130d-bd4d-43b7-919c-6d6088dec456" + "ID": "50b453fc-f154-4432-8c0a-03fa4a0df3d9" } ] } ], - "ID": "5f28a4bd-e887-4c0d-b2e8-7f5e68521af5" + "ID": "3c9cd85c-aeff-4d38-9740-938d58eece2f" } ] },