diff --git a/.collaboration b/.collaboration index bebb11eb..bd69f999 100644 --- a/.collaboration +++ b/.collaboration @@ -2454,52 +2454,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-08T18:54:14.616762+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "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_Forguncy.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" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2587,29 +2542,11 @@ }, { "ModuleName": "ServerCommandPrivate/AI生成项目汇报", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-08T18:52:57.1055352+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\AI生成项目汇报.json" - ] + "ModuleType": 27 }, { "ModuleName": "TaskScheduler/每周生成周报", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-08T18:52:57.1055859+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\定时任务\\每周生成周报.json" - ] + "ModuleType": 16 }, { "ModuleName": "TaskScheduler/每日生成日报", @@ -2617,16 +2554,7 @@ }, { "ModuleName": "ServerCommand/页面_生成项目汇报", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-12-08T18:52:57.1055458+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\页面_生成项目汇报.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/创建项目视频会议_页面", diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index 1250d0c1..baf725f7 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/SchedulerTasks/定时任务/每周生成周报.json b/SchedulerTasks/定时任务/每周生成周报.json index 22c569f7..5f8c0914 100644 --- a/SchedulerTasks/定时任务/每周生成周报.json +++ b/SchedulerTasks/定时任务/每周生成周报.json @@ -5,9 +5,9 @@ { "$type": "Forguncy.SaveLoad.WeeklyScheduleTriggerSaveData, ServerDesignerCommon", "DaysOfWeek": [ - 1 + 0 ], - "StartDateTime": 45616.333333333336, + "StartDateTime": 45616.75, "ScheduleRunInDebugServer": false } ], @@ -19,7 +19,7 @@ "TableName": "项目表", "BindingInfos": [ { - "GUID": "70b3a6b8-10b2-454f-ade5-3b5f9bc31678", + "GUID": "edd09dea-bb51-492d-832a-0533eccff4a6", "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", @@ -28,7 +28,7 @@ "ColumnName": "ID" }, { - "GUID": "4ddcd806-480f-4a4d-be5c-f9e0d14ac605", + "GUID": "522df4f1-72cf-4328-8f40-97025c0ac7c0", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目经理", @@ -37,7 +37,7 @@ "ColumnName": "项目经理" }, { - "GUID": "5dc07659-35f1-43e6-abad-0f08f3fcaecd", + "GUID": "17603b9f-9a92-4e13-b6c4-96bc934a4a2c", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", @@ -68,19 +68,29 @@ ] } }, - "ID": "2a3527850d7543bdb4cfae8b098a977a", + "ID": "deaf3edbc1e84e2d986011db624ad49d", "BreakpointIdentity": "157d2bda-68dd-4fcb-9d6d-fd9b3bf643f0" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "上周第一天", + "ParameterName": "本周第一天", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TODAY()-WEEKDAY(TODAY(),3)-7" + "SerializeProperty": "=TODAY()-WEEKDAY(TODAY(),3)" }, - "ID": "6575a463499c496da45afd045578755e", + "ID": "df92815915cf4d4b8a6f35e43a53d228", "BreakpointIdentity": "eac48097-aa12-4a95-9221-bb32d4f7a083" }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "本周最后一天", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()-WEEKDAY(TODAY(),3)+6" + }, + "ID": "30fc8cda20f14e26b91c7e60a6cc4a4a", + "BreakpointIdentity": "3cd3a2b6-9867-4eb0-a2d1-47f861459d3c" + }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", "LoopInfo": { @@ -111,10 +121,18 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "日期", + "ParamName": "开始日期", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=上周第一天" + "SerializeProperty": "=本周第一天" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=本周最后一天" } } ], @@ -128,7 +146,7 @@ { "ResultPropertyName": "生成日报", "ResultTo": { - "SerializeProperty": "生成日报" + "SerializeProperty": "生成汇报" } } ], @@ -182,7 +200,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=上周第一天" + "SerializeProperty": "=本周最后一天" } }, { @@ -210,7 +228,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报对象", - "GUID": "b99ddd66-bbb4-430a-b2a9-755f7e641d93" + "GUID": "cc144cc7-1157-4ecc-9d45-8f0471e299f1" }, "Value": "项目" }, @@ -218,7 +236,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报类型", - "GUID": "48b9033d-741b-432c-a6a4-3318ec379fa1" + "GUID": "25ef692c-469f-4dfe-8730-b0d46abe4fb0" }, "Value": "周报" }, @@ -226,7 +244,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报对象ID", - "GUID": "8f7715a2-14f9-4cdc-8d28-3b9d4d9700ab" + "GUID": "6ca95cdf-dfd7-4267-b7fb-c35e3342bd1d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -237,18 +255,18 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "开始日期", - "GUID": "59fdf0fb-6f7f-4ee5-9e16-49a15838cc99" + "GUID": "2e610634-a618-4cf7-a1d1-c216c935425f" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=上周第一天" + "SerializeProperty": "=本周最后一天" } }, { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "汇报人", - "GUID": "dfbe3f72-314d-414f-afd9-aed9190431fb" + "GUID": "ee5d5206-638d-4888-8d34-dcf0b8570fce" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -259,7 +277,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "标题", - "GUID": "0bf58b6f-90af-47a1-b8aa-34dd3166f590" + "GUID": "038099ce-3c7d-4e39-a11d-decca911262d" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -270,29 +288,29 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "内容", - "GUID": "59ce6ee7-bd30-4ba9-93ee-8c75eb252192" + "GUID": "ea3a0428-abaf-466a-8488-9835ff33205b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日报" + "SerializeProperty": "=生成汇报" } }, { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "纯文本内容", - "GUID": "b77777bd-6e95-4d39-9539-1cec0389acb2" + "GUID": "e105995e-3147-4cf5-ba06-ed2913ea17de" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日报" + "SerializeProperty": "=生成汇报" } }, { "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "总工时", - "GUID": "54e0fd4a-8353-4bf0-8032-e4b8a73710e8" + "GUID": "d9a0d9f9-d353-4879-a8fd-51e7014436ad" }, "Value": "0" }, @@ -300,7 +318,7 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "状态", - "GUID": "bdb42c78-92dc-4f0b-a71f-67fe1f5fb55b" + "GUID": "6743d7ba-93b7-49e1-84f9-3e1f2cb7ec45" }, "Value": "1" } @@ -308,7 +326,7 @@ "BreakpointIdentity": "142c2fcd-7d6a-42b7-8211-6bf29d15b5cd" } ], - "ID": "40d85b4f-68bd-40fa-b06d-795ace485515" + "ID": "cfce7d54-38cd-4e9f-b9da-6896da805123" } ], "BreakpointIdentity": "6c4c49ed-716f-4eea-aa95-21e0869c6586" diff --git a/ServerCommands/汇报/AI生成项目汇报.json b/ServerCommands/汇报/AI生成项目汇报.json index 3f0f3d3c..f6f332d5 100644 --- a/ServerCommands/汇报/AI生成项目汇报.json +++ b/ServerCommands/汇报/AI生成项目汇报.json @@ -30,12 +30,20 @@ }, { "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon", - "Name": "日期", + "Name": "开始日期", "DataValidationInfo": { "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon", "IgnoreBlank": false }, "TestData": "2024-11-25" + }, + { + "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon", + "Name": "结束日期", + "DataValidationInfo": { + "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon", + "IgnoreBlank": false + } } ] }, @@ -68,7 +76,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "d2594234-f106-45b2-bb14-c3495114d985", + "GUID": "66b35fa0-9e97-4c97-a376-06767c700d45", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目表", @@ -79,7 +87,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "62984990-40c9-432d-859b-1cc9b049bc22", + "GUID": "11596650-2706-4518-81c7-1ed31f130754", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目表", @@ -94,7 +102,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "f8e06570-2c01-4563-b07a-0db9ee9bfd33", + "GUID": "85fe6f61-9ea9-4d0c-aabd-1d379ececf6d", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目表", @@ -124,7 +132,7 @@ }, "TopCount": "1" }, - "ID": "366d3c7f89084456afb92b4e8e200822", + "ID": "d33db990aabe44c38c5cc2fab5c9ba33", "BreakpointIdentity": "b79b7d2e-7b26-40e4-8b8e-00444e6ea719" }, { @@ -161,7 +169,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=appName&\"FGC_%E7%BB%B4%E6%8A%A4%E4%B8%AD?ID=\"&项目ID" }, - "ID": "6c44e8c6713e4d1caa843490b6b180ef", + "ID": "da3d26b8181a4c38b92cb27191c3e09d", "BreakpointIdentity": "cfb3fe18-fe8a-4ef4-b55b-104cf0070412" }, { @@ -169,9 +177,9 @@ "ParameterName": "开始日期", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=日期-WEEKDAY(日期,3)" + "SerializeProperty": "=开始日期" }, - "ID": "946994b143a44e5586a662016b76d42b", + "ID": "cc904ca85075463394fb2ff7261ef2ab", "BreakpointIdentity": "9483c6ff-0d2e-4ac0-9726-43b6dcca805c" }, { @@ -179,9 +187,9 @@ "ParameterName": "结束日期", "ParameterValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期-WEEKDAY(开始日期,3)+6" + "SerializeProperty": "=结束日期" }, - "ID": "b6c67c83f1da4dd2bdf01b86fba3972d", + "ID": "8d683adfb01546dcb5340216a695a20a", "BreakpointIdentity": "33a41b86-1c45-4c0b-9ab4-0c192bf86ae8" }, { @@ -195,7 +203,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "c9d818c0-8c7d-440c-a742-080f7f014b23", + "GUID": "10d3f086-ee0b-4c0e-ae32-5503f7db9258", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -206,7 +214,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "c58679fb-be50-4810-bf57-ade82bb69cce", + "GUID": "4d2da1f3-d89c-4d4c-a1be-bf7b1edc9510", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "任务工时表", @@ -295,7 +303,7 @@ }, "NullFormulaValueQueryPolicy": 2 }, - "ID": "e845b350188641dc985d4acd6cde4dd2", + "ID": "7da3c444364043f8b9f849715d9603f2", "BreakpointIdentity": "852dcb83-2877-4a02-b1d5-70071e8d7534" }, { @@ -392,7 +400,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "aa3e66d5-d1cd-4bd9-b637-34ee465362be", + "GUID": "0c915fce-0b05-4b43-ad90-27b18ef09c57", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目发布记录", @@ -409,7 +417,7 @@ }, { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "d71b1dfb-7b46-4703-8dad-be620d20773a", + "GUID": "97465401-9385-436e-b985-64dd18507166", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "项目发布记录", @@ -470,7 +478,7 @@ } } }, - "ID": "e05c12066a46452d9e6f0713a4e42782", + "ID": "60c4fe1aa80a4a9390ff37e9c99a5143", "BreakpointIdentity": "4f6e6838-2384-4912-b031-07f676092857" }, { @@ -661,7 +669,7 @@ } ] }, - "ID": "7671beba-11d1-4a54-97bc-82d00272c867" + "ID": "d32a8387-cf6f-469a-9074-65b404908409" } ] }, @@ -818,7 +826,7 @@ } ] }, - "ID": "3917e3f9-1e04-484b-838c-b5f019e12553" + "ID": "69dd0b18-41f9-41f5-9015-1ba9d6f6e687" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -842,7 +850,7 @@ } ] }, - "ID": "3c9a74ea-caa4-4b2a-b4ef-e90094e36cb4" + "ID": "2c649270-7aa2-43f3-991f-be272276a639" } ] }, diff --git a/ServerCommands/汇报/页面_生成项目汇报.json b/ServerCommands/汇报/页面_生成项目汇报.json index 78df83d3..cecfe3bc 100644 --- a/ServerCommands/汇报/页面_生成项目汇报.json +++ b/ServerCommands/汇报/页面_生成项目汇报.json @@ -89,11 +89,15 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "日期", + "ParamName": "开始日期", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=日期" } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期" } ] },