diff --git a/.collaboration b/.collaboration index 41f60f28..d9b786b3 100644 --- a/.collaboration +++ b/.collaboration @@ -2570,16 +2570,7 @@ }, { "ModuleName": "TaskScheduler/每周生成周报", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-20T22:47:44.4863874+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\定时任务\\每周生成周报.json" - ] + "ModuleType": 16 }, { "ModuleName": "TaskScheduler/每日生成日报", diff --git a/SchedulerTasks/定时任务/每周生成周报.json b/SchedulerTasks/定时任务/每周生成周报.json index b391b1cb..bd33766f 100644 --- a/SchedulerTasks/定时任务/每周生成周报.json +++ b/SchedulerTasks/定时任务/每周生成周报.json @@ -19,13 +19,31 @@ "TableName": "项目表", "BindingInfos": [ { - "GUID": "7a922b8f-51d7-4242-a337-b30dcd1b621f", + "GUID": "e67621e4-ba86-48dd-a220-0496ee36897d", "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", "GUID": "f206c3ad-8efa-40ef-a1aa-a2f003c8ee92" }, "ColumnName": "ID" + }, + { + "GUID": "a2c81655-103c-412d-8b28-ce1a2b6f6b77", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "ecbadf6c-bb28-47df-90ac-dc3674c7ec82" + }, + "ColumnName": "项目经理" + }, + { + "GUID": "6c2487f6-44c4-4ee4-a1f8-2173946dc757", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "794b61c2-7144-46cc-982d-6743dab9380a" + }, + "ColumnName": "项目名称" } ], "SqlCondition": { @@ -50,9 +68,19 @@ ] } }, - "ID": "9c4ff7b9e2344049a21ed099f99129cc", + "ID": "1df973ef6a9943a9ba5c82249a685a0b", "BreakpointIdentity": "157d2bda-68dd-4fcb-9d6d-fd9b3bf643f0" }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "上周第一天", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TODAY()-WEEKDAY(TODAY(),3)-7" + }, + "ID": "3470584f5fb542a698d212e69b139cbb", + "BreakpointIdentity": "eac48097-aa12-4a95-9221-bb32d4f7a083" + }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", "LoopInfo": { @@ -86,7 +114,7 @@ "ParamName": "日期", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TODAY()-WEEKDAY(TODAY(),3)-7" + "SerializeProperty": "=上周第一天" } } ], @@ -107,6 +135,135 @@ "RefreshAfterFinish": true, "CheckDataValidation": true, "BreakpointIdentity": "1cfede2f-912d-48a9-9f20-e39d6ebfecdd" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报对象", + "GUID": "34e636ef-db0f-45a4-ae94-5f593c4f7d88" + }, + "Value": "项目" + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报类型", + "GUID": "40b57fab-38fe-4130-a772-3e7fb6b9ffb4" + }, + "Value": "周报" + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报对象ID", + "GUID": "5433bba0-862a-45dc-b779-b11bf7268696" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.ID" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "开始日期", + "GUID": "9a6e5ed0-689a-42e5-a3e2-1639777a8ed6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=上周第一天" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "汇报人", + "GUID": "3e71ce53-8bb1-42a5-b487-2d6cd260c81d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.项目经理" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "标题", + "GUID": "c07a090e-ea4b-4fdc-96f0-257e71ce71f1" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.项目名称&\"的项目周报\"" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "内容", + "GUID": "e3d57da5-256d-498e-8fc8-fad2e1734516" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日报" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "纯文本内容", + "GUID": "da3f8080-c393-4605-a030-d56d3cd36422" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日报" + } + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "总工时", + "GUID": "5065acc1-df80-420c-92d2-0a0eaa753cd9" + }, + "Value": "0" + }, + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "状态", + "GUID": "9a938f1a-93fa-4760-b0ab-f35266ffe9c3" + }, + "Value": "1" + } + ], + "BreakpointIdentity": "142c2fcd-7d6a-42b7-8211-6bf29d15b5cd" + } + ], + "ID": "c833327f-3f2c-4caf-87ad-48aa461a7690" + } + ], + "BreakpointIdentity": "6c4c49ed-716f-4eea-aa95-21e0869c6586" } ], "BreakpointIdentity": "535518a1-b9b7-4753-bfc6-636e32777dd7"