From 583845b343750eb075aa2fb107791ac128afb484 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 30 Aug 2024 22:32:33 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":27,"Name":"ServerCommandPrivate/=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=98=A8=E6=97=A5=E6=97=A5=E6=8A=A5"},{"Stat?= =?UTF-8?q?e":1,"Type":15,"Name":"ServerCommand/=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=B1=87=E6=8A=A5=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90=E5=86=85?= =?UTF-8?q?=E5=AE=B9"},{"State":1,"Type":39,"Name":"PublishConfiguration"}?= =?UTF-8?q?,{"State":3,"Type":27,"Name":"ServerCommandPrivate/Base?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B1=87=E6=8A=A5=E6=A8=A1=E6=9D=BF=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=86=85=E5=AE=B9"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 39 +- PublishSettingsConfig.json | 11 +- .../汇报/Base根据汇报模板生成内容.json | 605 ++++++++++++++++ ServerCommands/汇报/根据汇报模板生成内容.json | 643 +++--------------- ServerCommands/汇报/自动生成昨日日报.json | 10 +- 5 files changed, 717 insertions(+), 591 deletions(-) create mode 100644 ServerCommands/汇报/Base根据汇报模板生成内容.json diff --git a/.collaboration b/.collaboration index 8f2b37c9..47d0a9ff 100644 --- a/.collaboration +++ b/.collaboration @@ -1446,29 +1446,11 @@ }, { "ModuleName": "ServerCommandPrivate/自动生成昨日日报", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-30T22:30:16.1585504+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\自动生成昨日日报.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/根据汇报模板生成内容", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-30T22:31:23.9268867+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\根据汇报模板生成内容.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/批量生成日报", @@ -2272,16 +2254,7 @@ }, { "ModuleName": "PublishConfiguration", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-30T22:22:12.8950347+08:00", - "ModuleType": 39, - "ToRemoveFiles": [ - "PublishSettingsConfig.json" - ] + "ModuleType": 39 }, { "ModuleName": "Plugin", @@ -2297,12 +2270,6 @@ }, { "ModuleName": "ServerCommandPrivate/Base根据汇报模板生成内容", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-08-30T22:30:05.3315969+08:00", "ModuleType": 27 } ] \ No newline at end of file diff --git a/PublishSettingsConfig.json b/PublishSettingsConfig.json index 21465f45..91e83f43 100644 --- a/PublishSettingsConfig.json +++ b/PublishSettingsConfig.json @@ -1,17 +1,20 @@ [ { - "Name": "格友服务器", - "ApplicationUrl": "https://develop.gridfriend.cn/clue", + "Name": "约格服务器", + "ApplicationUrl": "https://www.yugasoft.cn/clue", "Remark": "腾讯云服务器", "PublishSettings": { "IsPrivateServer": true, - "ServerName": "develop.gridfriend.cn", + "ServerName": "www.yugasoft.cn", "UserName": "Administrator", "SitePort": 443, "AppName": "clue", "AppStartPage": "首页", "TakeServeronline": true, - "Https": true + "Https": true, + "PublishRolesToServer": true, + "PublishUsersToServer": true, + "PublishOrganizationsToServer": true } } ] \ No newline at end of file diff --git a/ServerCommands/汇报/Base根据汇报模板生成内容.json b/ServerCommands/汇报/Base根据汇报模板生成内容.json new file mode 100644 index 00000000..8955a0a3 --- /dev/null +++ b/ServerCommands/汇报/Base根据汇报模板生成内容.json @@ -0,0 +1,605 @@ +{ + "Name": "Base根据汇报模板生成内容", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "Parameters": [ + { + "Name": "生成日期", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "2024/6/13" + }, + { + "Name": "汇报类型", + "DataValidationInfo": {}, + "TestData": "日报" + }, + { + "Name": "汇报对象", + "DataValidationInfo": {} + }, + { + "Name": "对象ID", + "DataValidationInfo": {} + }, + { + "Name": "汇报人", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "shamus" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "OutParamaterName": "汇报列表" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "处理汇报日期", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=TEXT(生成日期,\"yyyy-MM-dd\")" + }, + "ID": "4ace18ec3a9544668738b0790a291a54" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "总工时", + "TableValue": { + "TableName": "任务工时表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "373b5db3-9019-4c86-8b5d-b749601675b1", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "46a18c6e-820c-44e3-9b0e-78348a51130d" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "117f7a1f-f51f-4722-ac8d-5b04732bc1b3" + }, + "Value": "实际" + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "46450718969a4aeea8c451b6a387a2bd" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "最近报工项目", + "TableValue": { + "TableName": "任务工时表", + "BindingInfos": [ + { + "GUID": "f53e666c-6927-4991-a7d0-035e05e98a09", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "9fe63173-5128-4215-acc4-6709548766a8" + }, + "ColumnName": "项目ID" + }, + { + "GUID": "302831ef-9cf8-4e69-a894-384b2ccbc7bd", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "eb8227d3-06cb-489a-b20e-0ea5a64755ec", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "GUID": "482ba89c-88c1-4834-a01d-dc6e61793310", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "46a18c6e-820c-44e3-9b0e-78348a51130d" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "117f7a1f-f51f-4722-ac8d-5b04732bc1b3" + }, + "Value": "实际" + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "f172e7641ed8478d9abbae743aa187ed" + }, + { + "$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": "=最近报工项目.Count" + } + }, + "value": "0", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=最近报工项目" + }, + "LoopItemParamName": "当前项目" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目报工信息", + "TableValue": { + "TableName": "任务工时表", + "BindingInfos": [ + { + "GUID": "109c944c-b561-471c-98d7-a013cb305188", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "0a31eb22-29b7-4138-a6a0-98d920d0f715" + }, + "ColumnName": "工作内容" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "d5d3e143-4db7-495f-973a-a6686207b7f3" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前项目.项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "65c531dc-6b4c-4568-8153-a0ac38c3ec10" + }, + "Value": "%Null%" + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "1724b9cb79214e1e8af86bfb49938e9d" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "项目名称", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前项目.项目名称" + } + }, + { + "Name": "内容列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目报工信息" + } + } + ], + "OutParamaterName": "单个项目" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报列表" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=单个项目" + }, + "OutParamaterName": "汇报列表" + } + ] + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "汇报列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报列表" + } + } + ], + "OutParamaterName": "数据源" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "汇报日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理汇报日期" + } + }, + { + "Name": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + { + "Name": "总工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=总工时.总工时" + } + }, + { + "Name": "汇报列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报列表" + } + } + ], + "OutParamaterName": "数据源", + "Disabled": true + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "查找模板", + "TableValue": { + "TableName": "汇报模板对应表", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "d65d3c11-ebb1-4b7e-b8eb-ac58fbd7d5e2", + "BindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "模板ID", + "GUID": "c7ff5824-2d67-4b0f-9b8f-e01ec06a8511", + "RelationBinding": { + "RelatedTable": "汇报模板", + "RelatedColumn": "ID", + "DisplayColumn": "模板内容" + } + }, + "ColumnName": "模板内容" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "汇报对象", + "GUID": "86547761-1198-4fa9-90b9-ad99af9b3dc9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报对象" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报模板对应表", + "ColumnName": "汇报类型", + "GUID": "d831036f-9c97-4988-b548-4c7b25b5fc29" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报类型" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "bf0cea8b763e46aeb807c216aeda31eb" + }, + { + "$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": "=查找模板" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "MustachePlugin.Render, MustachePlugin", + "DataSrouce": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找模板.模板内容" + }, + "UseCustomsDataHash": true, + "CustomsDataHash": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=数据源" + }, + "SetMaxRecursionDepth": 11, + "ResultTo": "输出结果" + }, + { + "$type": "Summernotetools.ReplaceTemplateParameters, Summernotetools", + "HtmlContent": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=输出结果" + }, + "ReplaceRules": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"\"" + }, + "ReturnText": true, + "ResultTo": "纯文本" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "成功", + "CustomReturns": [ + { + "ReturnPropertyName": "日报内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=输出结果" + } + }, + { + "ReturnPropertyName": "日报文本", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=纯文本" + } + }, + { + "ReturnPropertyName": "返回总工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=总工时.总工时" + } + } + ] + } + ], + "ID": "32ea446e-86d1-4b9d-962c-d05e90b54e9b" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "未找到模板", + "CustomReturns": [ + { + "ReturnPropertyName": "日报内容" + }, + { + "ReturnPropertyName": "日报文本" + }, + { + "ReturnPropertyName": "返回总工时" + } + ] + } + ], + "ID": "25509097-baec-4179-8265-caf71b1051e5" + } + ] + } + ], + "ID": "8b0a2877-f71d-4c6e-befa-3e5ac32503f5" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=处理汇报日期&\"无报工内容！\"" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "日报内容" + }, + { + "ReturnPropertyName": "日报文本" + }, + { + "ReturnPropertyName": "返回总工时" + } + ] + } + ], + "ID": "7e6028ac-1802-4295-abb3-7dcfb4533e83" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "日报内容" + }, + { + "ReturnPropertyName": "日报文本" + }, + { + "ReturnPropertyName": "返回总工时" + } + ] + } + ] + } + } + ], + "ReturnProperties": [ + { + "Name": "日报内容" + }, + { + "Name": "日报文本" + }, + { + "Name": "返回总工时" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json index b57c49c5..7243a806 100644 --- a/ServerCommands/汇报/根据汇报模板生成内容.json +++ b/ServerCommands/汇报/根据汇报模板生成内容.json @@ -57,555 +57,106 @@ ], "Commands": [ { - "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", - "TryCommandPart": { - "CommandList": [ - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "OutParamaterName": "汇报列表" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "处理汇报日期", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(生成日期,\"yyyy-MM-dd\")" - }, - "ID": "4ace18ec3a9544668738b0790a291a54" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "总工时", - "TableValue": { - "TableName": "任务工时表", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "373b5db3-9019-4c86-8b5d-b749601675b1", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "46a18c6e-820c-44e3-9b0e-78348a51130d" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报人" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "117f7a1f-f51f-4722-ac8d-5b04732bc1b3" - }, - "Value": "实际" - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "46450718969a4aeea8c451b6a387a2bd" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "最近报工项目", - "TableValue": { - "TableName": "任务工时表", - "BindingInfos": [ - { - "GUID": "f53e666c-6927-4991-a7d0-035e05e98a09", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "9fe63173-5128-4215-acc4-6709548766a8" - }, - "ColumnName": "项目ID" - }, - { - "GUID": "302831ef-9cf8-4e69-a894-384b2ccbc7bd", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "eb8227d3-06cb-489a-b20e-0ea5a64755ec", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } - }, - "ColumnName": "项目名称" - }, - { - "GUID": "482ba89c-88c1-4834-a01d-dc6e61793310", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "总工时", - "GUID": "46a18c6e-820c-44e3-9b0e-78348a51130d" - }, - "ColumnName": "总工时" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报人" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "117f7a1f-f51f-4722-ac8d-5b04732bc1b3" - }, - "Value": "实际" - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "f172e7641ed8478d9abbae743aa187ed" - }, - { - "$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": "=最近报工项目.Count" - } - }, - "value": "0", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", - "LoopInfo": { - "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", - "LoopCount": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=最近报工项目" - }, - "LoopItemParamName": "当前项目" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目报工信息", - "TableValue": { - "TableName": "任务工时表", - "BindingInfos": [ - { - "GUID": "109c944c-b561-471c-98d7-a013cb305188", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "0a31eb22-29b7-4138-a6a0-98d920d0f715" - }, - "ColumnName": "工作内容" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行人", - "GUID": "4b3d5f6f-19ec-4644-bc88-01914025be5c" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报人" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "d0d914d3-0167-477a-a9ee-1b7549dd00b0" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=生成日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "项目ID", - "GUID": "d5d3e143-4db7-495f-973a-a6686207b7f3" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前项目.项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 1, - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "执行内容", - "GUID": "65c531dc-6b4c-4568-8153-a0ac38c3ec10" - }, - "Value": "%Null%" - } - ] - }, - "NullFormulaValueQueryPolicy": 0 - }, - "ID": "1724b9cb79214e1e8af86bfb49938e9d" - }, - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "项目名称", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前项目.项目名称" - } - }, - { - "Name": "内容列表", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目报工信息" - } - } - ], - "OutParamaterName": "单个项目" - }, - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报列表" - }, - "Operation": 4, - "OperationParamaterAName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=单个项目" - }, - "OutParamaterName": "汇报列表" - } - ] - }, - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "汇报列表", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报列表" - } - } - ], - "OutParamaterName": "数据源" - }, - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "汇报日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理汇报日期" - } - }, - { - "Name": "汇报人", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报人" - } - }, - { - "Name": "总工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总工时.总工时" - } - }, - { - "Name": "汇报列表", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报列表" - } - } - ], - "OutParamaterName": "数据源", - "Disabled": true - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "查找模板", - "TableValue": { - "TableName": "汇报模板对应表", - "TableValueType": 1, - "BindingInfos": [ - { - "GUID": "d65d3c11-ebb1-4b7e-b8eb-ac58fbd7d5e2", - "BindingInfo": { - "TableName": "汇报模板对应表", - "ColumnName": "模板ID", - "GUID": "c7ff5824-2d67-4b0f-9b8f-e01ec06a8511", - "RelationBinding": { - "RelatedTable": "汇报模板", - "RelatedColumn": "ID", - "DisplayColumn": "模板内容" - } - }, - "ColumnName": "模板内容" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报模板对应表", - "ColumnName": "汇报对象", - "GUID": "86547761-1198-4fa9-90b9-ad99af9b3dc9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报对象" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "汇报模板对应表", - "ColumnName": "汇报类型", - "GUID": "d831036f-9c97-4988-b548-4c7b25b5fc29" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=汇报类型" - } - } - ] - }, - "NullFormulaValueQueryPolicy": 0, - "TopCount": "1" - }, - "ID": "bf0cea8b763e46aeb807c216aeda31eb" - }, - { - "$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": "=查找模板" - } - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "MustachePlugin.Render, MustachePlugin", - "DataSrouce": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=查找模板.模板内容" - }, - "UseCustomsDataHash": true, - "CustomsDataHash": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=数据源" - }, - "SetMaxRecursionDepth": 11, - "ResultTo": "输出结果" - }, - { - "$type": "Summernotetools.ReplaceTemplateParameters, Summernotetools", - "HtmlContent": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=输出结果" - }, - "ReplaceRules": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"\"" - }, - "ReturnText": true, - "ResultTo": "纯文本" - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": "成功", - "CustomReturns": [ - { - "ReturnPropertyName": "日报内容", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=输出结果" - } - }, - { - "ReturnPropertyName": "日报文本", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=纯文本" - } - }, - { - "ReturnPropertyName": "返回总工时", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总工时.总工时" - } - } - ] - } - ], - "ID": "a65b10d3-963f-42ba-a1d1-d143217cf282" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "未找到模板", - "CustomReturns": [ - { - "ReturnPropertyName": "日报内容" - }, - { - "ReturnPropertyName": "日报文本" - }, - { - "ReturnPropertyName": "返回总工时" - } - ] - } - ], - "ID": "06cb83e3-b6f5-4db5-b5a5-0bbf5826194a" - } - ] - } - ], - "ID": "c8d56b14-ef28-4e1a-bb85-c175d18ebb9e" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=处理汇报日期&\"无报工内容！\"" - }, - "CustomReturns": [ - { - "ReturnPropertyName": "日报内容" - }, - { - "ReturnPropertyName": "日报文本" - }, - { - "ReturnPropertyName": "返回总工时" - } - ] - } - ], - "ID": "18edc31a-b9aa-480b-818d-040ed89306bc" - } - ] + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "Base根据汇报模板生成内容", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "生成日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成日期" } - ] + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报类型", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报类型" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报对象", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报对象" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "对象ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=对象ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" }, - "CatchCommandPart": { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ExceptionCode" - }, - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=ExceptionMessage" - }, - "CustomReturns": [ - { - "ReturnPropertyName": "日报内容" - }, - { - "ReturnPropertyName": "日报文本" - }, - { - "ReturnPropertyName": "返回总工时" - } - ] + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "日报内容", + "ResultTo": { + "SerializeProperty": "生成汇报内容" } - ] - } + }, + { + "ResultPropertyName": "日报文本", + "ResultTo": { + "SerializeProperty": "返回纯文本" + } + }, + { + "ResultPropertyName": "返回总工时", + "ResultTo": { + "SerializeProperty": "返回总工时" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "成功", + "CustomReturns": [ + { + "ReturnPropertyName": "日报内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=生成汇报内容" + } + }, + { + "ReturnPropertyName": "日报文本", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回纯文本" + } + }, + { + "ReturnPropertyName": "返回总工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回总工时" + } + } + ] } ], "ReturnProperties": [ diff --git a/ServerCommands/汇报/自动生成昨日日报.json b/ServerCommands/汇报/自动生成昨日日报.json index 721d913c..9c18ee55 100644 --- a/ServerCommands/汇报/自动生成昨日日报.json +++ b/ServerCommands/汇报/自动生成昨日日报.json @@ -101,7 +101,7 @@ }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "根据汇报模板生成内容", + "ServerCommandName": "Base根据汇报模板生成内容", "Parameters": [ { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", @@ -368,7 +368,7 @@ ] } ], - "ID": "b34c65e6-807e-4f27-88d9-2f4f311da074" + "ID": "3ff1755d-e7b2-4581-9048-711407ea8ff4" }, { "CommandList": [ @@ -438,17 +438,17 @@ "Disabled": true } ], - "ID": "451852e4-2722-45e3-a3be-784e732eb4b3" + "ID": "4122049c-a624-48e3-b860-bacb527162cb" } ] } ], - "ID": "db985719-024d-43df-a373-7bb3a7d26fcc" + "ID": "cfbcf5a9-b98a-4e9d-9f20-c63d33c33c7f" } ] } ], - "ID": "2d3b03d4-71e6-4ef1-9d90-23c155296557" + "ID": "7f80dcc9-7070-4bb8-a0ee-ed8df08e004f" } ] }