diff --git a/.collaboration b/.collaboration index d9f007fb..af8f8a6d 100644 --- a/.collaboration +++ b/.collaboration @@ -1402,16 +1402,7 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-26T11:29:38.238102+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/客户", @@ -2267,47 +2258,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-26T11:55:32.268046+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0(1).zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\发送HTTP请求命令-10_0_2_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_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\异步运行命令-9_0_103_0(2).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\裁剪并上传图片-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Plugin/客户端缓存操作工具库-8_0_0_0.zip b/Plugin/客户端缓存操作工具库-8_0_0_0(1).zip similarity index 96% rename from Plugin/客户端缓存操作工具库-8_0_0_0.zip rename to Plugin/客户端缓存操作工具库-8_0_0_0(1).zip index b6ffd5c3..264c7c91 100644 Binary files a/Plugin/客户端缓存操作工具库-8_0_0_0.zip and b/Plugin/客户端缓存操作工具库-8_0_0_0(1).zip differ diff --git a/Plugin/对象与集合操作工具-8_0_0_0.zip b/Plugin/对象与集合操作工具-8_0_0_0(1).zip similarity index 50% rename from Plugin/对象与集合操作工具-8_0_0_0.zip rename to Plugin/对象与集合操作工具-8_0_0_0(1).zip index 2274c9eb..93916635 100644 Binary files a/Plugin/对象与集合操作工具-8_0_0_0.zip and b/Plugin/对象与集合操作工具-8_0_0_0(1).zip differ diff --git a/Plugin/异步运行命令-9_0_103_0(1).zip b/Plugin/异步运行命令-9_0_103_0(1).zip new file mode 100644 index 00000000..96a0e39d Binary files /dev/null and b/Plugin/异步运行命令-9_0_103_0(1).zip differ diff --git a/Plugin/异步运行命令-9_0_103_0(2).zip b/Plugin/异步运行命令-9_0_103_0(2).zip deleted file mode 100644 index 1b03056d..00000000 Binary files a/Plugin/异步运行命令-9_0_103_0(2).zip and /dev/null differ diff --git a/Plugin/裁剪并上传图片-9_0_102_0.zip b/Plugin/裁剪并上传图片-9_0_102_0.zip deleted file mode 100644 index 53a6580b..00000000 Binary files a/Plugin/裁剪并上传图片-9_0_102_0.zip and /dev/null differ diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index f1b09403..a49cb1d4 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -455,7 +455,7 @@ "ID": "2d719d51ef5a46ee9aa64f113a34cce3" } ], - "ID": "c972b531-e9ed-4a2e-9859-1b662b67a770" + "ID": "83a6a185-3213-4636-baa5-6dd29a3a2c19" }, { "CommandList": [ @@ -478,7 +478,7 @@ "ID": "11255bb1a556487e972cf64b9d1da58b" } ], - "ID": "7ac1dbeb-5af9-4e32-8a07-847a4a2c9240" + "ID": "ed9b1a0d-d95b-499e-9f03-b01e1a2572c4" } ] }, @@ -559,7 +559,7 @@ "ID": "6928da5ea67d4786a7f8c0215c904bd4" } ], - "ID": "fad01323-161f-43e7-874d-5cdd107556e1" + "ID": "130a9fe0-b192-4226-aea2-f57d726b57d7" }, { "CommandList": [ @@ -573,13 +573,13 @@ "ID": "82c651b1c1424340b8c6b3ed1361b1fd" } ], - "ID": "48394c3d-e5c8-4241-a6e6-b3b8c3b642fa" + "ID": "254287dc-a1a3-45ba-8bd1-2716204b87db" } ] } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "2225ad24-8a20-4a82-a958-ab9df6a61cdc" + "ID": "34cfa00d-d7fe-4421-b86b-cf3fc9771ef4" }, { "CommandList": [ @@ -593,7 +593,7 @@ "ID": "db70a34a0b184db296d7851c8b8a66ea" } ], - "ID": "7794cf02-c7b2-4bbe-8907-bd5d1cdb38d8" + "ID": "8af37a73-5121-41fa-9716-206d061b6037" } ] }, @@ -610,7 +610,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "1e6fb738-3d19-4d3c-904d-684484bafc09" + "GUID": "1a25cd29-2385-4eef-9c85-e83601add1af" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -621,7 +621,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "ecc713dd-73a0-45fd-8bcf-6d9c9445aac9" + "GUID": "14f07022-4810-482b-90ef-aa2844505af7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -632,7 +632,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "09fa556e-186d-4a19-aa8c-61eba375f451" + "GUID": "1ecc29d8-a245-4e59-8503-30a63fa50d38" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -643,7 +643,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "2a32b811-3757-4b98-a2da-6e13e005db65" + "GUID": "b80ffd58-a019-4e7c-b644-9cf754764e1a" }, "Value": "实际" }, @@ -651,7 +651,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "7d0a64a7-d3a7-4094-b11c-f1c766c90848" + "GUID": "552fe044-d82a-45b6-939a-140c2fceb6e6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -662,7 +662,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "089f52bd-7282-4e46-9c79-8c7bd26eee77" + "GUID": "076f9520-d268-4763-ad07-83a49847c820" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -673,7 +673,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "c32e5e67-dc6b-4655-b04e-cd87b97a2e64" + "GUID": "c114adc0-29e5-4c5c-8a05-8a701e2e292b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -684,7 +684,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "上报工时", - "GUID": "8dcd050a-f8b8-475a-bca7-9f5f7d0779ce" + "GUID": "9b0b0db9-ff38-440d-a56c-acdb3d991411" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -695,7 +695,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "c6cad5a4-0262-484e-89f3-3f1324fb953f" + "GUID": "5b05a110-7ab8-4972-86d7-d93f4c73b1a5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -706,7 +706,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "172dc45b-dd32-435c-b260-7690334101cb" + "GUID": "81ed3896-b5d7-4fa9-819b-8d7a69a664e1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -717,7 +717,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "1a4391f0-206c-4a76-9d79-f5cd255b85be" + "GUID": "667e8ce5-7569-4ef1-8a28-85177d960221" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -744,18 +744,6 @@ }, "value": "3" }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=本次核定工时" - } - }, - "value": "0", - "compareType": 1 - }, { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { @@ -781,7 +769,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "bb2616d8-66c1-4c61-9709-d9c85b23febb" + "GUID": "6707d6cf-31e3-4263-938a-137162f84a28" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -792,7 +780,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "5469ad99-3c17-499a-8041-f25849de1057" + "GUID": "410045d0-6630-4bd3-9ae9-58a32bc7e98a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -803,7 +791,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "b8810d81-d275-4ae0-bf13-31784e2b3579" + "GUID": "e08f1b01-cf00-48c8-98ce-715b2b7f2d79" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -814,7 +802,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "c5f0f71c-d0af-4183-95cc-dc85f503396a" + "GUID": "c5ac7db7-32fc-4429-a992-c15b0f1a1a53" }, "Value": "计划" }, @@ -822,7 +810,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "3a19c8c0-a707-4f0e-a393-6ebe8a64d938" + "GUID": "08fc61cf-eb1d-4f4c-86ce-fb1f218eb833" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -833,7 +821,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "83bd7134-635f-4b52-92e7-6b7c7683fbcf" + "GUID": "7fb1a4ef-fbff-4ab2-9c71-e8d2f4369567" }, "Value": "系统自动生成对应计划，保证任务可分配工时" }, @@ -841,7 +829,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "ca91096d-a3b8-4f91-9dcb-d28a14f26b02" + "GUID": "e50bab88-4c6d-485c-8a3e-c3a093ede920" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -852,7 +840,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "上报工时", - "GUID": "4cf06126-3baa-4cee-9e9c-2f820f730f53" + "GUID": "06a765c1-1d51-460b-a355-013a6f0fa9f0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -863,7 +851,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "abd5624f-f38a-4cbb-b663-2204d9840141" + "GUID": "8b6afbac-f260-4d84-b141-6caa5d2ee109" }, "Value": "0" }, @@ -871,7 +859,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "d3378cdb-d47e-483e-be38-9bb2c9a6713a" + "GUID": "87eb2640-6c8d-4a45-a34e-cd2fa765600e" }, "Value": "0" }, @@ -879,16 +867,18 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪来源", - "GUID": "ea8e6c2d-4fd4-436c-8139-6319f114ae03" + "GUID": "1f990909-947c-4a75-879d-620dd6c6d445" } } - ] + ], + "Comments": "针对分配到任务的场景，系统补一个计划任务，保证视图数据正常" } ], "Comments": "如果是分配到任务，就补一条计划，保证任务可分配工时准确", - "ID": "69de0929-edc2-4594-b805-1bdf744edada" + "ID": "e4bc6cbb-ca58-41e6-8d59-ca55bda7831e" } - ] + ], + "Disabled": true } ] }, @@ -911,7 +901,7 @@ "ID": "dfe08a493a80498e8915bc2fe710ad21" } ], - "ID": "faaaccd8-b0de-44f2-867d-96e6ef041dee" + "ID": "60c42de8-efd1-406e-a665-a1a23887e7ad" }, { "CommandList": [ @@ -924,7 +914,7 @@ } } ], - "ID": "1f1b5b4b-ec8b-40ce-9523-d04e33ea8637" + "ID": "1306dd73-8d9e-4d68-97ac-4f417a32a862" } ] } @@ -984,7 +974,7 @@ "Message": "报工成功" } ], - "ID": "40b85596-07f5-43df-8b67-46655a4574df" + "ID": "355b21af-bc65-4b2c-8fee-6f68ea59e299" }, { "CommandList": [ @@ -1000,12 +990,12 @@ } } ], - "ID": "0bb0f7b8-5d63-4ede-bb35-7bab1a6b538f" + "ID": "07241824-91dd-4457-8d56-0adaf68bec3c" } ] } ], - "ID": "9d0756ce-332d-4013-add2-a5beecea8a46" + "ID": "6aaeb1bd-4af0-447c-879e-af0053ffe577" }, { "CommandList": [ @@ -1018,7 +1008,7 @@ } } ], - "ID": "3b3992ab-c597-4e2d-8d97-547aead29400" + "ID": "d3732c86-6a1b-4765-87ac-27aa1c43bd99" } ] }