From 648654f4df77c9124041f780bd085bc10e244e7b Mon Sep 17 00:00:00 2001 From: cuckooent Date: Fri, 6 Sep 2024 19:56:50 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E9=80=8F=E8=A7=86=E8=A1=A8=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=86=85=E5=AE=B9=EF=BC=9B","MessageType":2,?= =?UTF-8?q?"Modules":[{"State":1,"Type":23,"Name":"TableView/View=5F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1"},{"Stat?= =?UTF-8?q?e":1,"Type":1,"Name":"PCPage/=E4=BA=BA=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E7=BB=9F=E8=AE=A1"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 23 +-- Pages/工时/人员工时统计.json | 227 ++++++++++++++--------------- Tables/工时/View_任务工时统计.json | 16 +- 3 files changed, 127 insertions(+), 139 deletions(-) diff --git a/.collaboration b/.collaboration index fc9f8680..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -122,16 +122,7 @@ }, { "ModuleName": "TableView/View_任务工时统计", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-06T19:50:22.1334991+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\View_任务工时统计.json" - ] + "ModuleType": 23 }, { "ModuleName": "Tables/需求反馈", @@ -1207,17 +1198,7 @@ }, { "ModuleName": "PCPage/人员工时统计", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-06T19:50:31.8405619+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\人员工时统计.json", - "Pages\\工时\\人员工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPages/流程母版页面文件夹", diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json index 2cd9589e..b8251876 100644 --- a/Pages/工时/人员工时统计.json +++ b/Pages/工时/人员工时统计.json @@ -231,8 +231,8 @@ "1,1": "成员", "1,13": "日期", "1,40": "导出原始数据", - "17,1": "工时日期", - "17,9": "执行人" + "17,1": "执行人", + "17,3": "工时日期" }, "AttachInfos": { "1,3": { @@ -406,7 +406,7 @@ "DisplayName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!J19" + "SerializeProperty": "=人员工时统计!B19" }, "BackgroundValue": {} }, @@ -415,14 +415,14 @@ "DisplayName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!B19" + "SerializeProperty": "=人员工时统计!D19" }, "Format": "yyyy\"年\"m\"月\"d\"日\"", "BackgroundValue": { "DatabaseColumnName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!B19" + "SerializeProperty": "=人员工时统计!D19" } } }, @@ -431,22 +431,13 @@ "DisplayName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!D19" + "SerializeProperty": "=人员工时统计!F19" }, "BackgroundValue": {} }, { "DatabaseColumnName": "任务名称", "DisplayName": "任务名称", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!F19" - }, - "BackgroundValue": {} - }, - { - "DatabaseColumnName": "执行内容", - "DisplayName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!H19" @@ -455,34 +446,12 @@ } ], "Values": [ - { - "DatabaseColumnName": "计划工时", - "DisplayName": "计划工时", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!N19" - }, - "Aggregator": 0, - "TotalAggregator": 0, - "BackgroundValue": {} - }, - { - "DatabaseColumnName": "上报工时", - "DisplayName": "上报工时", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!L19" - }, - "Aggregator": 0, - "TotalAggregator": 0, - "BackgroundValue": {} - }, { "DatabaseColumnName": "核定工时", "DisplayName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!P19" + "SerializeProperty": "=人员工时统计!L19" }, "Aggregator": 0, "TotalAggregator": 0, @@ -494,35 +463,35 @@ "DatabaseColumnName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!B19" + "SerializeProperty": "=人员工时统计!D19" } }, { "DatabaseColumnName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!D19" + "SerializeProperty": "=人员工时统计!F19" } }, { "DatabaseColumnName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!F19" + "SerializeProperty": "=人员工时统计!H19" } }, { "DatabaseColumnName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!H19" + "SerializeProperty": "=人员工时统计!J19" } }, { "DatabaseColumnName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!J19" + "SerializeProperty": "=人员工时统计!B19" } }, { @@ -543,7 +512,7 @@ "DatabaseColumnName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!P19" + "SerializeProperty": "=人员工时统计!L19" } } ], @@ -612,6 +581,52 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!结束日期" } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 2, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "核定工时", + "GUID": "d2b065ac-d80a-4871-a237-05b0493cc404" + }, + "Value": "0" + } + ] + }, + "OrderByCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "c9dbb588-a418-4d73-ad0d-82df43113f24" + }, + "Order": 0 + }, + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "fa3a5298-2ed8-4d69-90ce-4aa752cbc1c4" + }, + "Order": 0 + }, + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目名称", + "GUID": "f10d3ef9-dc37-446f-afbd-dceaf68e558f" + }, + "Order": 0 + }, + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务名称", + "GUID": "744fec66-bf0c-4e1b-96f3-a4673d4ff5cb" + }, + "Order": 0 } ] }, @@ -624,48 +639,6 @@ } }, "18,1": { - "NameUsedInJavaScript": "工时日期", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "b90691ec-db5a-4abb-a63c-e2a33e7c5d59" - } - }, - "18,3": { - "NameUsedInJavaScript": "项目名称", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "0d67b03d-0299-4931-9bba-dedaf00ca002", - "RelationBinding": { - "RelatedTable": "项目平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } - } - }, - "18,5": { - "NameUsedInJavaScript": "任务名称", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "2c3c95bc-41f9-4994-aad9-e8e91896834f", - "RelationBinding": { - "RelatedTable": "任务平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "任务名称" - } - } - }, - "18,7": { - "NameUsedInJavaScript": "执行内容", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行内容", - "GUID": "b2f20b17-9533-4c52-8be7-704cbb62da1d" - } - }, - "18,9": { "NameUsedInJavaScript": "执行人", "BindingInfo": { "TableName": "View_任务工时统计", @@ -677,23 +650,39 @@ } } }, + "18,3": { + "NameUsedInJavaScript": "工时日期", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "b90691ec-db5a-4abb-a63c-e2a33e7c5d59" + } + }, + "18,5": { + "NameUsedInJavaScript": "项目名称", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目名称", + "GUID": "7bd2839c-fbf9-4e41-a838-9ef274bbb65a" + } + }, + "18,7": { + "NameUsedInJavaScript": "任务名称", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务名称", + "GUID": "694b9d14-3113-4a62-918f-cc3790426241" + } + }, + "18,9": { + "NameUsedInJavaScript": "执行内容", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行内容", + "GUID": "b2f20b17-9533-4c52-8be7-704cbb62da1d" + } + }, "18,11": { - "NameUsedInJavaScript": "上报工时", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "上报工时", - "GUID": "7f65b3b6-ba7f-4266-9ba7-d71e9920f77d" - } - }, - "18,13": { - "NameUsedInJavaScript": "计划工时", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "f9b1f74d-d8d0-45e7-92ce-89ef494b4507" - } - }, - "18,15": { "NameUsedInJavaScript": "核定工时", "BindingInfo": { "TableName": "View_任务工时统计", @@ -748,7 +737,12 @@ "1,30": 1, "1,31": 0, "3,1": 2, + "17,1": 0, + "17,2": 0, + "17,3": 0, + "17,4": 0, "17,5": 0, + "17,6": 0, "17,7": 0, "17,8": 0, "17,9": 0, @@ -756,7 +750,6 @@ "17,11": 0, "17,12": 0, "17,13": 0, - "17,14": 0, "17,18": 3, "17,19": 3, "17,20": 3, @@ -783,7 +776,12 @@ "17,41": 3, "17,42": 3, "17,43": 3, + "18,1": 0, + "18,2": 0, + "18,3": 0, + "18,4": 0, "18,5": 0, + "18,6": 0, "18,7": 0, "18,8": 0, "18,9": 0, @@ -791,7 +789,6 @@ "18,11": 0, "18,12": 0, "18,13": 0, - "18,14": 0, "18,18": 3, "18,19": 3, "18,20": 3, @@ -834,22 +831,18 @@ "21,1,1,3", "21,4,1,3", "1,40,1,4", - "18,1,1,2", - "17,1,1,2", "18,3,1,2", - "17,3,1,2", "18,5,1,2", - "17,5,1,2", "18,7,1,2", - "17,7,1,2", "18,9,1,2", + "18,1,1,2", + "18,11,1,3", + "17,1,1,2", + "17,3,1,2", + "17,5,1,2", + "17,7,1,2", "17,9,1,2", - "18,11,1,2", - "17,11,1,2", - "18,13,1,2", - "17,13,1,2", - "18,15,1,3", - "17,15,1,3" + "17,11,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -869,7 +862,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务工时表" + "RelatedDataTableName": "View_任务工时统计" }, "PrintInfo": { "PaperSize": {}, @@ -889,4 +882,4 @@ "Formula": "人员工时统计!$E$22" } ] -}//gS6WGRibmcHtHRecu82bGfiza0CFm4t0QhJ+9cdxyKPcT+M3MJrjGnulrWm6WuMZfMXovd9KTooNNbLpTG7mXjCNE8Hniol0C2krYFcyjAYeH7NDYXH/R8GFdRjYHSFg/7CI1NoWl3CGB1HeBX89bwYJyV37ain5EQYkDmh8UGC03GDU7Bo4R2wBDZoADF+sz2hFO6Th0wN7+HZ9v5Z9B5L9WK8VzcgpDv7sEThU7hoSlKDyARRpoaa+rc3WXpszZEuOvoJKFvFBR54eGs4nDWX/KBPVY9iKK7rKarJ+IluBgPr83Y5aNWqxJBcakDM2wfwxvIYR9EAoaY9RwjIGNL0oAs6WFA8VrhEOaoQ5H70p6rzOxB5Yulh3H4w+a8Jh3vEWfoo3j9PFKeron7pcZfdNMPthxBOYaLWjB/Y1Ws5itvB2vLLjugNj655W8mTEG3da45tWr41pIOu0slJDTrgiROP4b79NS05w6471BtU7QIxP+o0/kJhiwxbv+j1gia7shtfHGQ4tgLuY7Wr8XEWJ275/gVAR2nEQcij7H2z2ldvdDlaqH86fl/8se3qqXtvAyVTiXmoRUkC4WKHLbptXU9YrvXPFOj83wDVIYkUitva1tOdOIHI7yUFya9UK3TjbIs1FHV2zNV0piC3+qWZ9Z3Zgqu/TUo/mrfwL+6PmpEx4BpLhvkp0XavEafP1BLkBsPMZl491kolgxKYydwx+mB6/pzho5PqtAJYk8KzfF9n2sz6wSXCWteeYmFk8yNz091pqy+9TGc88Jua0CeLYoyVaX1CwLNMaiutzzV6oroUuPqS0Hrs6SqU3ugJsiQoOKq4qUYobSocCb+Ds1FwCmArsxW8MMywW5xXyGd4EAzUtLUMEJHA7yA75ycArVJzAYSoV1DmY1YUciSxJhg==|920 \ No newline at end of file +}//lmaKEjeU6z5AYDQHGcWn0h8cxJlCVinKSD3FWY75qKt+D0f9DFCcEmzNJ7LHhWlkG4nVJBg7tyCRzk7Cycw0sfiryI6wgIP6+fODPdAUwonRSIguYsVi8I+tcWXvhsg6QBI8vZc0FoqIUgfrHJ3oaiHLamvoN23GFG+oxoXNrp5CoIH36VcNq9QL4U0aJn7TIC/pV8OBQh+aBKwwYBjZIgMQzTgdTWICbhGGzbqhGPsRHdYRxDIzsQvp2egSn/c0uBx56HqGP3tsmjmVayoes70SRgIxcXkp6anUUL8Ma+z0TtUmbE4P4eP7agaDogvvxNtADlbnU9ERN8pkHkzCGMVf1EsoBjMgPkhbaACaFyQDGPYUve3LYXheNTUuR4ehOPyETYT8cegrEz5jzLQtHk2elJnvdwEMQTj/ptGa79JIvaIAqdTYDdSU/BgKdFu3aqnQuwLp2q88weIL0pI9rMoGdPgzXwSa9sZXLUVEFxRo2cTzv2yPaMDmXRD0mPSS2IPBPs42q2M2QQbWWEG3eh70nMDyp6DO+MCUxhI3F3jJkpUwM+JZFZ15R51XOiMXnr/ueqDvRonbtriw/S2wdBT8QJ98PRryfBeHiRp2VE9KMp5L4QQfJP/ESdazLCVjGDiiSjO8+wuFvrwPu5e6lWFGQrHdN/9BiJEfgyIdQlXZ91QreDOLVElIz14jGVwWUS6NtYxhkBF602rYJCKecc7Q8Bt59J4A2Lbsxglb8WhJHpdD3cLrgu47vPB4eH22O8nIR5xAm9uMTOjdiLeCnWOoHAEsvvkhatRbiNpGdq1A7e/Jn4zhyMzpKtXYjNQ3sNSKqY1AWGVXS8dw9dbPXDFSip1lu7SRPxjRic5aFuJk4Uytc6o9q648KNl0d/+mxQcFQDKxZkT9616TalBWpA==|920 \ No newline at end of file diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index 8ff84f36..766e1d79 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -23,6 +23,13 @@ "Name": "项目ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "项目名称", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "bigint", @@ -30,6 +37,13 @@ "Name": "任务ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "任务名称", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -153,7 +167,7 @@ "ConnectionId": "业务表", "SourceTableName": "View_任务工时统计", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH c1 as (\r\n\tSELECT\r\n\t t.[ID],\r\n\t\t[项目ID],\r\n\t\t[任务ID],\r\n\t\t[执行内容],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\t[请款单ID],\r\n\t\tISNULL([上报工时],0) AS 上报工时,\r\n\t\tROUND(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END,1) AS [计划工时],\r\n\t\tROUND(CASE WHEN [工时类型] = '实际' THEN ISNULL([工时],0) ELSE 0 END,1) AS [实际工时]\r\n\tFROM \r\n\t\t[dbo].[任务工时表] t\r\n\tLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\n)\r\n\r\nSELECT\r\n cast(c1.[工时日期] as date) as 日期,\r\n\t\tc1.[执行人],\r\n c1.[项目ID],\r\n c1.[任务ID],\r\n\t\tSTRING_AGG(c1.[执行内容], CHAR(13) + CHAR(10)) AS 执行内容,\r\n AVG(c1.[时薪单价]) AS 时薪单价,\r\n AVG(c1.[提成系数]) AS 提成系数,\r\n SUM(c1.[计划工时]) AS 计划工时,\r\n\t\tSUM(c1.[上报工时]) AS 上报工时,\r\n SUM(c1.[实际工时]) AS 核定工时,\r\n SUM(c1.[实际工时]*c1.[时薪单价] *c1.[提成系数]) as 核定收益\r\n\t\t\r\nFROM c1\r\nGROUP BY\r\ncast([工时日期] as date),\r\nc1.[执行人],\r\n[项目ID],\r\n[任务ID]", + "CreateViewSql": "WITH c1 as (\r\n\tSELECT\r\n\t t.[ID],\r\n\t\t[项目ID],\r\n\t\t[任务ID],\r\n\t\t[执行内容],\r\n\t\t[执行人],\r\n\t\t[工时日期],\r\n\t\t[时薪单价],\r\n\t\t[提成系数],\r\n\t\t[请款单ID],\r\n\t\tISNULL([上报工时],0) AS 上报工时,\r\n\t\tROUND(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END,1) AS [计划工时],\r\n\t\tROUND(CASE WHEN [工时类型] = '实际' THEN ISNULL([工时],0) ELSE 0 END,1) AS [实际工时]\r\n\tFROM \r\n\t\t[dbo].[任务工时表] t\r\n\tLEFT JOIN [项目表] p ON t.项目ID = p.ID\r\n)\r\n\r\nSELECT\r\n cast(c1.[工时日期] as date) as 日期,\r\n\t\tc1.[执行人],\r\n c1.[项目ID],\r\n\t\txm.[项目名称],\r\n c1.[任务ID],\r\n\t\trw.[任务名称],\r\n\t\tSTRING_AGG(c1.[执行内容], CHAR(13) + CHAR(10)) AS 执行内容,\r\n AVG(c1.[时薪单价]) AS 时薪单价,\r\n AVG(c1.[提成系数]) AS 提成系数,\r\n SUM(c1.[计划工时]) AS 计划工时,\r\n\t\tSUM(c1.[上报工时]) AS 上报工时,\r\n SUM(c1.[实际工时]) AS 核定工时,\r\n SUM(c1.[实际工时]*c1.[时薪单价] *c1.[提成系数]) as 核定收益\r\nFROM c1\r\nLEFT JOIN [项目表] xm ON c1.[项目ID] = xm.ID\r\nLEFT JOIN [任务表] rw ON c1.[任务ID] = rw.ID\r\nGROUP BY\r\ncast([工时日期] as date),\r\nc1.[执行人],\r\nc1.[项目ID],\r\nxm.[项目名称],\r\nc1.[任务ID],\r\nrw.[任务名称]", "ViewInfo": { "ViewName": "View_任务工时统计", "IsUpdatable": true,