From 5ef4ad4319fcf4677241b1a2504f59e0fb76d3fd Mon Sep 17 00:00:00 2001 From: cuckooent Date: Mon, 2 Sep 2024 13:07:25 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E6=9B=B4=E6=96=B0=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E6=8E=A5=E5=8F=A3","MessageType":2,"Modules":[{"State?= =?UTF-8?q?":1,"Type":15,"Name":"ServerCommand/getEmployeeWorkHoursData"}]?= =?UTF-8?q?,"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 11 +- .../OPENAPI/getEmployeeWorkHoursData.json | 170 +++++++++++++++--- 2 files changed, 145 insertions(+), 36 deletions(-) diff --git a/.collaboration b/.collaboration index 5d361824..d80e8133 100644 --- a/.collaboration +++ b/.collaboration @@ -2270,16 +2270,7 @@ }, { "ModuleName": "ServerCommand/getEmployeeWorkHoursData", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-02T12:55:48.8502302+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\OPENAPI\\getEmployeeWorkHoursData.json" - ] + "ModuleType": 15 }, { "ModuleName": "Image/魔法棒-默认.svg", diff --git a/ServerCommands/OPENAPI/getEmployeeWorkHoursData.json b/ServerCommands/OPENAPI/getEmployeeWorkHoursData.json index 267ca067..0ad56fe9 100644 --- a/ServerCommands/OPENAPI/getEmployeeWorkHoursData.json +++ b/ServerCommands/OPENAPI/getEmployeeWorkHoursData.json @@ -23,19 +23,19 @@ }, "Parameters": [ { - "Name": "user", + "Name": "userName", "DataValidationInfo": { "IgnoreBlank": false }, "TestData": "shamus" }, { - "Name": "startData", + "Name": "startDate", "DataValidationInfo": {}, "TestData": "2024-08-27" }, { - "Name": "type", + "Name": "endDate", "DataValidationInfo": {} } ], @@ -51,7 +51,7 @@ }, { "$type": "SaveFormData.fillInJSONProperties, SaveFormData", - "FullJsonString": "{\r\n \"user\":\"\",\r\n \"startData\":\"\",\r\n \"type\":\"个人日报\"\r\n}", + "FullJsonString": "{\r\n \"userName\":\"\",\r\n \"startDate\":\"\",\r\n \"endDate\":\"\"\r\n}", "SourceJson": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=请求信息.Body" @@ -66,7 +66,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "08a1ed98-79d1-421f-847f-ad8e6c1cc6a3", + "GUID": "103b6f46-ca4a-4b5c-a9b5-ade05d581fe2", "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", @@ -108,7 +108,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "31ff45091bea4d6c82e46e86e81337b5" + "ID": "8f86aaa3aa6e44c49f3843bdb66346a6" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -189,7 +189,138 @@ } ], "RefreshAfterFinish": true, - "CheckDataValidation": true + "CheckDataValidation": true, + "Disabled": true + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "工时记录", + "TableValue": { + "TableName": "任务工时表", + "BindingInfos": [ + { + "GUID": "88e5af6f-ecb8-4b52-a20e-4ba943582ec7", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "8e06e903-10d2-4fcf-9519-443cd33e6de0" + }, + "ColumnName": "工时日期" + }, + { + "GUID": "16261470-dcb6-4041-a474-ece27665f9ef", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "项目ID", + "GUID": "131f5801-0b83-41d0-be38-604f06e6052c", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目名称" + }, + { + "GUID": "6341c819-03a2-40f4-97ef-08dea5902d73", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "任务ID", + "GUID": "3424f6e9-f2b5-44e0-bb0d-c4daaccd6e55", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务名称" + }, + { + "GUID": "91995ec0-2d70-4f4e-9186-dfd514302dbd", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行内容", + "GUID": "dc47373c-d5cf-4ef1-9e07-66e040d40ca9" + }, + "ColumnName": "工作内容" + }, + { + "GUID": "3a800fc9-d9f3-4594-bd31-8c13a718c8f2", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "d2885c56-a32d-443a-b3cb-fe6414bc7c1f" + }, + "ColumnName": "工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "c5307e4e-9cba-40fa-a094-44a845aa91bc" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名.用户名" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "d23bd76a-b0c0-4e62-bb12-d7d941f88a42" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=startDate" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "9007fec3-77d0-453f-a45c-eaf811a0392d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=endDate" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时类型", + "GUID": "049ddcc8-55f3-4a8c-9712-40e59c630cfb" + }, + "Value": "实际" + } + ] + }, + "NullFormulaValueQueryPolicy": 0, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "44baf233-d9a7-4c8d-8518-2989076c9824" + }, + "Order": 0 + } + ] + } + }, + "ID": "01365f8058d44b89b3c537fe97f00921" }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -203,23 +334,16 @@ }, "CustomReturns": [ { - "ReturnPropertyName": "content", + "ReturnPropertyName": "worksList", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=日报内容" - } - }, - { - "ReturnPropertyName": "duration", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=总工时" + "SerializeProperty": "=工时记录" } } ] } ], - "ID": "0e11cefc-1914-496c-84b0-e4a294118219" + "ID": "79473741-fec9-4faa-a59b-87b9e152a8f3" }, { "CommandList": [ @@ -229,25 +353,19 @@ "Message": "您查找的成员不存在，请告诉我用户名或全名", "CustomReturns": [ { - "ReturnPropertyName": "content" - }, - { - "ReturnPropertyName": "duration" + "ReturnPropertyName": "worksList" } ] } ], - "ID": "9abf89ed-3359-4b21-8bdd-0595f939b57d" + "ID": "3910ad3d-a7c6-46c3-8356-645d5cf69f5c" } ] } ], "ReturnProperties": [ { - "Name": "content" - }, - { - "Name": "duration" + "Name": "worksList" } ] } \ No newline at end of file