diff --git a/.collaboration b/.collaboration index 15cbaa0c..0f390586 100644 --- a/.collaboration +++ b/.collaboration @@ -498,17 +498,7 @@ }, { "ModuleName": "PCPage/项目反馈", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-14T23:51:42.4124571+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况-关键数据", @@ -740,17 +730,7 @@ }, { "ModuleName": "PCPage/处理反馈工单", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-14T23:50:47.1673173+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\处理反馈工单.json", - "Pages\\项目\\项目反馈\\处理反馈工单.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目任务分组详情", @@ -1534,16 +1514,7 @@ }, { "ModuleName": "ServerCommand/将反馈转为任务", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-14T23:50:26.0541206+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目反馈\\将反馈转为任务.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/修改项目反馈状态", @@ -1811,16 +1782,7 @@ }, { "ModuleName": "ServerCommandPrivate/订阅钉钉回调事件", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-13T00:06:47.8797965+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\订阅钉钉回调事件.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/创建任务审批待办", @@ -2520,52 +2482,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-14T23:52:47.7955365+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_102_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\EL插件102版本.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_102_0.zip", - "Plugin\\JSON数据源-10_0_102_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_5_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_102_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\加载动画-10_0_102_0.zip", - "Plugin\\发送HTTP请求命令-10_0_102_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_102_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_102_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_102_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_102_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_102_0.zip", - "Plugin\\设置焦点命令-10_0_102_0.zip", - "Plugin\\读取管理控制台日志-10_0_5_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\钉钉SDK2.0-10_0_5_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/项目/项目反馈/处理反馈工单.json b/Pages/项目/项目反馈/处理反馈工单.json index 9269f06b..6e8ae041 100644 --- a/Pages/项目/项目反馈/处理反馈工单.json +++ b/Pages/项目/项目反馈/处理反馈工单.json @@ -260,19 +260,20 @@ } ], "PostCommands": [ - { - "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon", - "BreakpointIdentity": "a10022a7-98af-42ae-ae92-c8de455e6833" - }, { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", "FunctionName": "remove", "Title": "加载中", "BreakpointIdentity": "36811ce3-a3f5-4096-aad1-743fdf9314fd" }, + { + "$type": "Forguncy.Model.IgnorePageDirtyCommand, ServerDesignerCommon", + "BreakpointIdentity": "a10022a7-98af-42ae-ae92-c8de455e6833" + }, { "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", "ReloadData": true, + "Disabled": true, "BreakpointIdentity": "9171d7f5-0a26-4067-852d-41539763d796" } ], @@ -853,7 +854,7 @@ "BreakpointIdentity": "a4127f7c-5cf9-4377-8e0c-26165974d6d6" } ], - "ID": "e7874930-7c3d-4553-93d4-70fa0dac5dc2" + "ID": "7697e7fd-5035-4249-9b15-15d6ed202652" }, { "CommandList": [ @@ -869,7 +870,7 @@ "BreakpointIdentity": "63407a1b-5292-49be-9606-7ad4aec87c35" } ], - "ID": "53ff9d0d-a4ea-4ec7-a7f6-9cb73fa48afe" + "ID": "2bb42dd2-3761-487f-96c0-ca0820315e04" } ], "BreakpointIdentity": "e3dada0e-65b9-450d-b4f6-c0c182f1c426" @@ -1071,7 +1072,7 @@ "BreakpointIdentity": "58ed15dd-c248-4b95-beaa-7e2c1a00fb94" } ], - "ID": "d51f9465-418d-4ad0-bbf1-e1a36682c467" + "ID": "8d37768b-4ac7-4c8c-9f7c-e99b757e4087" } ], "BreakpointIdentity": "ee097a72-7523-4a1a-aad5-05397331cfb1" @@ -1492,7 +1493,7 @@ "BreakpointIdentity": "4892ef7f-fb2d-41ad-90e5-aad95880f3bc" } ], - "ID": "458f1f3e-9b90-45c3-bffc-4797d8bd91b8" + "ID": "db0040fb-3e98-4df5-8ac1-a348857f7dcf" } ], "BreakpointIdentity": "b9c1557b-fde8-4a51-aeaf-b87bbfd66cf2" @@ -1557,4 +1558,4 @@ "Formula": "处理反馈工单!$V$17" } ] -}//DmlhnhMvTvPh3gNYLLo2zFVYshCKgVqG+Nb8UnhdnBTwRVCcWfUuX1i0imdaSjyCRIU2l9/VhRgtSiZdolVYb7SwKxDJZf54O5CTkFBXPrqgoszx2UsPt8JSWDwVM5dqOD9piZ5tj6EICMAUw+XV+nbKS+wWS5OzaPzyDaIgdtdcfEO81BiauKnwaKXD8qX07pu8/aYz8ghwy437fjtBaYf1zWsncOoBiZi7xndbgiMhOXB1E9UpYOUCrM7Vp2wGbIa1DFDofc/Q2eGavm6IXG63suBNfdC4ElFyrHNusmXtR5+WyLGKoc8O6V10IhR2ASTydZN5U1NTI7ThTSZESk5QaZKIXIFD/NZG7/q3NL0+NpiqF/4P8Q8aSQht+0WiiMtBbdq9bpNEul6Vm0gzU6thbgHHrGgMG3p31g+4x90VA3ZVPHjx9dDyJXooN8eOxJ8QuyziWzEUXHtxa6PhKMJr9UZUB368/jLompwou6ol3y9efqGxZel5Vpn19fMm3nUbu4RLDsVQfgIX5GN8f/vWUO3SEWxp6aWPOiKpDXT+4Siysq27Jz4BdFsArSBcXBbvMqU5byALXDbN5zHpdH2KmByTjM7KQYwKqdSKNjeKtCUGuhzUZR0u6nU+Orv+NTeN1xH91R7QhA8stimdASkvNmbLH1t8B6nA2Ui7YNa6qPJyZ2drBgntNiuDNOJz7Z/jxbJarPs8Lh/Ut8aAf4hBVYDLDSNC7hhiJeiT0EQjIHWOafx0EDqA6sksihgFvw4IQBhRLasr0D6JGNn/K8mc6alj1J/GQgW+T3Lw6vCy7DNJc/fFjIPBaYfJuorfSRbHL8YNf/gqu4R7PltQ9qlqpuKdnM5OxMVK7qGegBBprql3kZEFW+w6W59LlPGdHqad9M+4W3C4e61mcRPRuA==|920 \ No newline at end of file +}//O88Xu11vXJKh78QuleRQfj54Xyi+Zw/CCSC/W1SGcdc7C3UF8i1wh8LonMtFhFgKGOt0gSuh8Hhrp0FH53adajTsUjS/XMwRUY6LJpDBa2RSSpirmORWVGE5AVaiXIK19+NqG0Yk3UHMdHjiW2gGgVyrRFtPU7fR9q8FOuRWz0ixWGHw7u4wKrayuB4Pi0Ckbs4dr2FIo2PazBEOSNqKPuwGyZAAMstznG3kiCQDB1uHaGg7tsHZKdPA80Vqx/J1MKeR9+/jEPC9Zkg8uQN+HftQW/AypMpse+yph8EgRWXGuzB7Qa12k4kX7RPWus6R5vfYKXLY8SWGyFXmxzbDCMoVtkxXe/GNto78VPcgmVhDx5T+wgGZ4uVLqrvP5LJLgy7cmrLWN1Xda+5Pwz+cCc8wWaQ5XWInhZlbPy1KItTsc68++KcVwbBJLgn8m9y7Eh6hfMG8X8hPm8SL7QyienDt6cLcEmwu62ZJ/Hg9cYd9KbjCIvlcw1wVKgqfWzHi9gYHCEuBuBek1B23g8aTxtiGxi2mQTrvQrmRFE9VDZY1Oxgou6VjBdRoO6Nz1JBHOj2JqGpElhkE6nlyKLmLdW9dOdRCgCBvhamHSPDWLqSaa6hhdqwGwQt12dzlOYWdC7OMJJhAa8n18xPfehbfpMezcNxj+HaZeAK3EExLirdlfaJOOgP0Lyjmsq3jzqoqd6RdSVwZgqjED0CJygo9NhVQW+u28yijL/NCCYpITAJIVaAT8lxLhVsP1RX9em/6MKXMKlYmOUTRhVgqaGOWRT6Pfyc7q3JeQySHLxQ3czWEmUZFo/CAtJPbRy8/8YNLGFU+gqeFalN4IJz/7dSLysOm6QfjQi3SZpx1bGJ6G4AHEFz9WkU3gyMQYemkF2d42XVfDpaF6ex7w+6OnoxBng==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json index 1bed909b..3dc0ab2a 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目反馈.json @@ -1105,13 +1105,42 @@ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "ShowDrawerHeader": true, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目反馈!B4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "ResetTable", + "ParameterValues": { + "clearSort": true, + "clearFilter": true + }, + "BreakpointIdentity": "95a00d3d-ffbb-457e-8cbd-92dc494ecfa2" + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } + }, "PageName": "处理反馈工单", "LoadBindingDataOption": 1, "BreakpointIdentity": "398a94bb-a498-41fd-9fb1-28d3d0c21f76" } ], "ParamProperties": { - "dataRow": "行数据" + "dataRow": "行数据", + "ID0": "行数据.ID", + "反馈类型1": "行数据.反馈类型", + "标题2": "行数据.标题", + "提交人3": "行数据.提交人", + "处理人4": "行数据.处理人", + "处理用时5": "行数据.处理用时", + "状态6": "行数据.状态", + "流程实例ID7": "行数据.流程实例ID" } }, "allowRoles": [ @@ -1268,4 +1297,4 @@ "PaperSize": {}, "Margin": {} } -}//idx0310Ji7QnDwzxI5Pd53bhUbi1MZ15JqxTovEAAZqXetYDjNrNhE18Hy6dQPl92szCKLJgKUs9l3dTS4W4YsSo8o7dMx8AKxfRNFxtGoNvMKgAuhoF+6+7R1HcADXFHVd1qTqQq+eN8lIHYwEiG72glqeE3xCSo8owFkGLZe4rOsm//LQOg67ZbpWdYbxkl4KUrp11MDVK+VTlihUWkKLDUhivDyG9YjWZL+UwxIr8TvU8qPV0rP1vmWXyLhIH2mM833TWz8NiU87cL2NNgiIZXkncP0iQCoZE5FGYtCAYahHfYEYvD6y0yJpcuB4NUa0s+uCvY6+7au163jwJXgl+3NKYP6YTJ6czqS/v7zCvoVHITQadTw9YubjI/LO4kV/tJhEQOk2cCoUb1l2+SNCvmc+F/UKw3VTtWUfde858YEsLCPDI2A+PPhBERv1SIYl0AnMfp3AcQ+3kwrqW/otlyuHFBtoXI79PhDM6vusN0jI3hzqUKdyuJSObSfkYC6DwT6gSzo7mDaW+P0wpWugVOg+16l+lernsdv+HJ2/Ncb6T1+ewzP7SbxSUs8DwdSwU9dMIDEkSshPhuEyUMtfp7PQB6/j6SsQZvVtLcRYx0DYQuSShIQw4GGS4xEyMRlk3uGmclYB+s+vgNIRZgM/scFPV9mIMwi/rUHe90c2ESU97C9RbeTFHUAFHTwFzyAu/c4HRPqMi8B+FJKlaeaVF73we2GRDkwtEKIBIQKb8yDz9NEs5blRF1AFJ/gyanBRuhPDTpmv8VTCQt+cVTe6G6MaDbcFheH2hYRYSbb831sNG2WnBfhYLxJA0+Vpw6SgFi5LFs0+69o36XCakUJhs1xB5adAYn2xfRXX72YOpTHOLq4YBac43WdtExKx4SiIle3cgXr44z+W0B0cs+g==|920 \ No newline at end of file +}//fC4NktT4wzWsxe5wGw4lSqn6Ln6HToiIxV5QF3Dc8GA10ib4XEK6jWLD13zqcMyDWjQAP2NpS6LKx1bnwA7nX+D2qnOjzBgCTBW/hIRVblFBYcnrSrn2tnwZBQKndyc/W4Bm54OvCknxZE2TDN09FG/1qk8wuEX+Thria68riWz62R19DST3VT6JdKJ1TcZDs4LlJuFqLasdq4JSFsbi4E/ewb9AYfXrkuTFEtBKucl/Ej9RShHvAknbIQw5ZLWAx7GTunjdThcyiwM94aUzywM+n/9Ep7EBLcxcoJgcC2bbG59Inj57UR0X55Fq/mrxwUWFXSSQdK3jq9BLr1qMzUCWK9WLkbDlsxRjpxks7zk3y/mNoR7i+60m9pT6Vm7YYKI806FQdRbmjga+k5kGGZpc/lP3XxSPLHeibNU+vfMS95MhPqzcl6c7NziHsVDilPO1PDaQG+GFiG25e6mjBynScq8DWHXnplTZYB2llUU37MBCBTiDsdtceJo7pL47Y90mM1jA/PM0Un6quwCI/QTOSEcWClh1gaP7fulMjtxtU8TQIhPF0BNt6vjvudOmW7/KI49hw/35T+8gbbb5u+1X/K5q2CywivVTpyK2GJbH6gUmtxLJasaDGZq/iCumbeCRHfhoZnpSgDKL8d/qDjmZqbZqJfGZuODzkO6ZmeaqGmX7EgFDhw7S3QPoFdcZ2AStdseg43qcnXQQtqyyY3t+lwqnWFbIEPUh75FQt8CDavgh14egTPk6U/LtpipOWXDAqAzj45ai7CULbQaZDtCa9RYlNqDJPUU4uqFMzPj4ftzN0v2nnbcwIy79OMws+39gJf05s65qZM0OPEazJKIMDsU7eG9QLVV2gT5BeAHVJtmEAP0sCeq8ZxxHf3/Az03qshoFlmvwuIPKjpZhXQ==|920 \ No newline at end of file diff --git a/Plugin/钉钉SDK2.0-10_0_5_0.zip b/Plugin/DingTalkPlugin.zip similarity index 99% rename from Plugin/钉钉SDK2.0-10_0_5_0.zip rename to Plugin/DingTalkPlugin.zip index 76888370..4fc0a197 100644 Binary files a/Plugin/钉钉SDK2.0-10_0_5_0.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/ServerCommands/钉钉/订阅钉钉回调事件.json b/ServerCommands/钉钉/订阅钉钉回调事件.json index 5d7ad679..752318bb 100644 --- a/ServerCommands/钉钉/订阅钉钉回调事件.json +++ b/ServerCommands/钉钉/订阅钉钉回调事件.json @@ -257,7 +257,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=(事件体.openConfModel.startTime/1000/60/60/24)+DATE(1970,1,1)" }, - "ID": "eb09e5c66ae84e4ea3b9dbf8ea873632", + "ID": "e9f95cc65be04c368627956c636f50df", "BreakpointIdentity": "4862204b-68d4-41c7-aecc-62911dc5b0fb" }, { @@ -287,7 +287,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议业务类型", - "GUID": "aebc6caa-4186-42be-bf66-4b4933b7764f" + "GUID": "d06973dc-b6fb-420b-90c8-67b5de5321fe" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -300,7 +300,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议开始时间", - "GUID": "9eaf9a31-bbb3-4e87-9296-d208246c61dc" + "GUID": "02b8677f-c2a7-4ea7-883f-34030bcb027f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -313,7 +313,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议持续时间", - "GUID": "95c2a67a-6774-450a-8400-2281cc80692d" + "GUID": "f06d27e5-094a-4391-883d-4d63080f7a3c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -326,7 +326,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "97444c11-8f74-430f-a52c-f751dc89f219" + "GUID": "1f3a2a6f-ce03-40eb-8fd5-297fc69d801f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -340,7 +340,7 @@ ] }, "Comments": "会议创建事件", - "ID": "bed0f054-1793-4c2a-bdc3-fb2c87a4e5a0" + "ID": "4d592dad-3268-4f59-a587-c801f64708df" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -365,7 +365,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=(事件体.openConfModel.startTime/1000/60/60/24)+DATE(1970,1,1)" }, - "ID": "c17a68dc25b24a7895fb049f55c76745", + "ID": "b68c2720a92a46738b9c63ecbcf89817", "BreakpointIdentity": "8f2dfd1b-0bed-43fc-85ff-6317352ebf34" }, { @@ -395,7 +395,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议结束时间", - "GUID": "c61ecd30-1567-4ec1-8486-942b6abb470b" + "GUID": "cc1af09e-53cd-4ab7-b1ef-359b0055e3e4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -408,7 +408,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议持续时间", - "GUID": "da510f75-dbfd-4550-9d3f-3a3ead6a510e" + "GUID": "898d81ef-d439-4a59-a92b-0f37174414b5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -421,7 +421,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "会议记录表", "ColumnName": "会议状态", - "GUID": "d06ef35f-7f6f-4cf5-b96a-b37de70d8b96" + "GUID": "a6fde8e8-4fe2-47fe-8601-43d6d9d779bf" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -440,15 +440,35 @@ { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=会议信息.自动拉会" - } - }, - "value": "1" + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": { + "$type": "System.Collections.Generic.List`1[[ForguncyDataAccess.ISqlCondition, ForguncyDataAccess]], System.Private.CoreLib", + "$values": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=会议信息.自动拉会" + } + }, + "value": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=事件体.openConfModel.confDuration/1000" + } + }, + "value": "59", + "compareType": 3 + } + ] + } }, "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", @@ -524,7 +544,7 @@ } ] }, - "ID": "e95314cb-22d2-48d0-8c2d-3087af670d60" + "ID": "f3e6c043-2f00-4384-a50d-7aa98d9e6997" } ] }, @@ -532,7 +552,7 @@ } ] }, - "ID": "e9bf5e61-943d-4267-8e39-37fab4a7a86f" + "ID": "72f01200-8356-48c2-9056-9dccb5750d13" } ] }, @@ -540,7 +560,7 @@ } ] }, - "ID": "e6a34c02-50f0-497c-b9c0-7b9cb674efbe" + "ID": "263716a6-a0b6-4502-bbfc-02e925b57a76" } ] }, @@ -549,7 +569,7 @@ ] }, "Comments": "会议状态变更", - "ID": "fb9f4efe-1edc-4696-8be3-06013f271273" + "ID": "afa31b9d-f81d-438b-aeaf-9bf6b1800e1c" } ] }, @@ -707,5 +727,9 @@ "BreakpointIdentity": "1bdc09e3-8d29-4891-876f-b063b2873e6f" } ] + }, + "ReturnProperties": { + "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ReturnPropertySaveData, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [] } } \ No newline at end of file diff --git a/ServerCommands/项目反馈/将反馈转为任务.json b/ServerCommands/项目反馈/将反馈转为任务.json index e8a5c24f..a75a78d6 100644 --- a/ServerCommands/项目反馈/将反馈转为任务.json +++ b/ServerCommands/项目反馈/将反馈转为任务.json @@ -61,7 +61,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "e6d64064-d638-44fb-b7b1-42bfce27a434", + "GUID": "d12371c0-4427-4bdf-bcbb-29be0cc1d79d", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "需求反馈登记表", @@ -72,7 +72,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "34419cac-16b0-429f-a130-5f9766e0a3cb", + "GUID": "6b44da15-546a-453c-ad34-7010d93b3e49", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "需求反馈登记表", @@ -83,7 +83,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "e5a58370-2922-430a-99c5-18f3cd7487dd", + "GUID": "aa212c1f-511a-4a6d-a9fd-3102aafed2e6", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "需求反馈登记表", @@ -94,7 +94,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "e5f96a50-757b-4d5b-97f8-f455a7822135", + "GUID": "9a5d807a-6ae6-43b6-bbe4-0fecf6fee290", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "需求反馈登记表", @@ -105,7 +105,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "c22c18a1-e10e-4877-9bde-3575c8cc7d0e", + "GUID": "7d08d0af-fc07-4f37-ba76-bc8e1ccb68db", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "需求反馈登记表", @@ -116,7 +116,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "5261aa36-dd03-4cac-a300-7b65e814a972", + "GUID": "b2eb6709-e916-4d4c-9699-26c5c3c38c13", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "需求反馈登记表", @@ -127,7 +127,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "82791eea-58e5-45f1-8ace-b0186d3f3238", + "GUID": "84ac9cb9-a12c-416b-ae76-1332cb907439", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "需求反馈登记表", @@ -138,7 +138,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "3ef1678d-8187-4fad-b1e8-f18de7affd8f", + "GUID": "1369a48a-729a-44be-b094-1ff8e33fb0d7", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "需求反馈登记表", @@ -164,7 +164,7 @@ }, "TopCount": "1" }, - "ID": "e181b74220c2473f94adb934dd662675", + "ID": "c665d9baf01c4cdcbc303964bc2b1a2b", "BreakpointIdentity": "4f85ae78-2f0a-4fbb-9926-e03627963c68" }, { @@ -208,7 +208,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "0df1a5e3-2b55-4692-8b3e-4040fb0c5c37" + "GUID": "4c34475b-db10-429f-8ef3-a38099892a5e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -221,7 +221,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "层级", - "GUID": "20650ab9-ee7b-4c0f-a1c7-60dc1fb4873a" + "GUID": "c27ffcbe-762e-4c97-b851-16e0d2a036a7" }, "Value": "0" }, @@ -231,7 +231,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "任务名称", - "GUID": "3a0ff9c9-1f03-4a7f-9f30-6c4619fb3875" + "GUID": "5c96f8fb-9863-41d2-aa1e-9b659d2cddcf" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -244,7 +244,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "任务负责人", - "GUID": "0afe6750-8f03-4b2f-9b4a-fa3ad091fe51" + "GUID": "e3be746e-e277-4c17-85bf-1519dee87c1e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -257,7 +257,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "开始时间", - "GUID": "91313406-b27d-4b1d-adb4-498bc9063c4d" + "GUID": "2dd195f8-cbc2-4eac-8db4-f8a3d3354967" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -270,7 +270,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "任务说明", - "GUID": "640d3cba-7afc-428d-89aa-be3d8efca453" + "GUID": "ab69b14a-3d31-44e8-98da-a75c5e4a264a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -283,7 +283,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "备注", - "GUID": "ca0d1041-a9d8-4e21-9a7e-ac49491132b2" + "GUID": "7b8ef8cc-eece-48d8-a74a-bc86a0390627" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -296,7 +296,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "任务预算工时", - "GUID": "40fccb06-7dfa-4f4f-bdfe-005c4dc22548" + "GUID": "fe1ed98f-9a4c-4324-b7eb-2ee05c12d4a6" }, "Value": "0" }, @@ -306,7 +306,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "进度", - "GUID": "17c7f61e-22cb-4ef4-abdd-c05e6b6acd91" + "GUID": "c2ebe9c2-ff0b-4122-b29b-2bfb683b2807" }, "Value": "0" }, @@ -316,7 +316,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "收集反馈", - "GUID": "7f502b38-911c-443a-a39b-5336d9753e2f" + "GUID": "a1503f8a-85a9-47af-9c61-aabb5a6e2901" }, "Value": "1" }, @@ -326,7 +326,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "81736bf5-08bc-41c6-aa1c-4cb915c9bc1c" + "GUID": "5ae8a7d9-239e-4f74-879a-a91709421653" }, "Value": "0" }, @@ -336,7 +336,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "功能名称", - "GUID": "f081162a-cd2f-458a-a6e1-ab1e149cc984" + "GUID": "6ce7363a-ed99-48a1-8191-9a1c76439201" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -349,11 +349,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务表", "ColumnName": "功能描述", - "GUID": "d5d49936-1146-4fcc-971c-4e2e7699f394" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=反馈单.内容" + "GUID": "419156fa-2640-4576-953a-cee74bcb0881" } } ] @@ -471,7 +467,7 @@ "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [] }, - "ID": "841736a8-6b6d-4fee-83d3-b27681b6ec12" + "ID": "771f10f1-2d83-49e5-bad9-7c9059345c98" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -495,7 +491,7 @@ } ] }, - "ID": "c22027d0-c821-48f3-b74e-a010cba5f091" + "ID": "a4966818-04ca-4951-a99e-fb4f60db1c59" } ] }, @@ -504,7 +500,7 @@ } ] }, - "ID": "5cf5f43f-53cb-45f4-9ada-4cfaff3c41c2" + "ID": "b607bf62-176f-45a7-83cc-b19d80103fa3" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -528,7 +524,7 @@ } ] }, - "ID": "6538e2e9-defb-477a-9068-4a3508756eac" + "ID": "e2abdd45-4110-4cc8-ab94-70a2d1f7e9bd" } ] },