diff --git a/.collaboration b/.collaboration index fa880d2e..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:27:36.3851978+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:29:03.8483287+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\人员工时统计.json", - "Pages\\工时\\人员工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -2269,49 +2250,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-06T19:34:39.1563936+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "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\\ReadLogs.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\\内容编辑器-9_0_103_0.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(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\异步运行命令-9_0_103_0(1).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\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json index 7026a858..2cd9589e 100644 --- a/Pages/工时/人员工时统计.json +++ b/Pages/工时/人员工时统计.json @@ -230,9 +230,9 @@ "Values": { "1,1": "成员", "1,13": "日期", - "1,30": "日期", "1,40": "导出原始数据", - "17,11": "执行人" + "17,1": "工时日期", + "17,9": "执行人" }, "AttachInfos": { "1,3": { @@ -370,26 +370,6 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, - "1,32": { - "CellType": { - "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 1, - "Items": [ - { - "Value": "", - "DisplayValue": "全部" - }, - { - "Value": "计划", - "DisplayValue": "计划" - }, - { - "Value": "实际", - "DisplayValue": "实际" - } - ] - } - }, "1,40": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", @@ -426,7 +406,7 @@ "DisplayName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!L19" + "SerializeProperty": "=人员工时统计!J19" }, "BackgroundValue": {} }, @@ -435,14 +415,14 @@ "DisplayName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!H19" + "SerializeProperty": "=人员工时统计!B19" }, - "Format": "[$-409]yyyy/m/d", + "Format": "yyyy\"年\"m\"月\"d\"日\"", "BackgroundValue": { "DatabaseColumnName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!H19" + "SerializeProperty": "=人员工时统计!B19" } } }, @@ -451,7 +431,7 @@ "DisplayName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!B19" + "SerializeProperty": "=人员工时统计!D19" }, "BackgroundValue": {} }, @@ -460,7 +440,7 @@ "DisplayName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!D19" + "SerializeProperty": "=人员工时统计!F19" }, "BackgroundValue": {} }, @@ -469,25 +449,15 @@ "DisplayName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!F19" - } - } - ], - "Cols": [ - { - "DatabaseColumnName": "工时类型", - "DisplayName": "工时类型", - "ColumnCell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!J19" + "SerializeProperty": "=人员工时统计!H19" }, "BackgroundValue": {} } ], "Values": [ { - "DatabaseColumnName": "工时", - "DisplayName": "工时", + "DatabaseColumnName": "计划工时", + "DisplayName": "计划工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!N19" @@ -495,61 +465,89 @@ "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" + }, + "Aggregator": 0, + "TotalAggregator": 0, + "BackgroundValue": {} } ], "DatabaseColumns": [ { - "DatabaseColumnName": "项目名称", + "DatabaseColumnName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!B19" } }, { - "DatabaseColumnName": "任务名称", + "DatabaseColumnName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!D19" } }, { - "DatabaseColumnName": "执行内容", + "DatabaseColumnName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!F19" } }, { - "DatabaseColumnName": "工时日期", + "DatabaseColumnName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!H19" } }, { - "DatabaseColumnName": "工时类型", + "DatabaseColumnName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!J19" } }, { - "DatabaseColumnName": "执行人", + "DatabaseColumnName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!L19" } }, { - "DatabaseColumnName": "工时", + "DatabaseColumnName": "计划工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!N19" } + }, + { + "DatabaseColumnName": "核定工时", + "ColumnCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=人员工时统计!P19" + } } ], - "CollapseRowHeaderIndex": 0, - "FrozenColumnIndex": 1 + "ForceFrozenRowHeader": true }, "ShowSubtotal": false, "ShowRowsTotal": false, @@ -568,7 +566,7 @@ "17,1": { "ListViewInfo": { "Name": "工时记录导出", - "TableName": "任务工时表", + "TableName": "View_任务工时统计", "RowIndex": 17, "ColumnIndex": 1, "RowCount": 4, @@ -580,9 +578,9 @@ "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", "CompareType": 8, "ColumnBindingInfo": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "0faaac25-df75-4a63-a753-39713130b978" + "GUID": "f45455bb-52b0-4bb6-a9a8-a6391e36ccfc" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -593,9 +591,9 @@ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "CompareType": 3, "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "d2a145e1-3348-4d39-90b8-02f870512590" + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "7736200d-43ab-4db9-b9d8-e2e5ceb9e187" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -606,26 +604,14 @@ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "CompareType": 5, "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "c761d3a8-bb5b-49ad-b0de-8c8b565d352e" + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "abf87325-e7b4-4ffe-ab82-074a868576ee" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=人员工时统计!结束日期" } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "9beb97c8-ba0f-468d-9a7a-89660386c8e8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!AG2" - } } ] }, @@ -638,24 +624,32 @@ } }, "18,1": { + "NameUsedInJavaScript": "工时日期", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "b90691ec-db5a-4abb-a63c-e2a33e7c5d59" + } + }, + "18,3": { "NameUsedInJavaScript": "项目名称", "BindingInfo": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", "ColumnName": "项目ID", - "GUID": "eee8d441-96b9-43cb-ab20-79c9eaf2d302", + "GUID": "0d67b03d-0299-4931-9bba-dedaf00ca002", "RelationBinding": { - "RelatedTable": "项目表", + "RelatedTable": "项目平行视图", "RelatedColumn": "ID", "DisplayColumn": "项目名称" } } }, - "18,3": { + "18,5": { "NameUsedInJavaScript": "任务名称", "BindingInfo": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", "ColumnName": "任务ID", - "GUID": "29945319-8bf4-477d-973f-b6ca687d3737", + "GUID": "2c3c95bc-41f9-4994-aad9-e8e91896834f", "RelationBinding": { "RelatedTable": "任务平行视图", "RelatedColumn": "ID", @@ -663,48 +657,48 @@ } } }, - "18,5": { + "18,7": { "NameUsedInJavaScript": "执行内容", "BindingInfo": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", "ColumnName": "执行内容", - "GUID": "518d2cf0-a2e5-435a-9ec6-5fae4b3c3c57" - } - }, - "18,7": { - "NameUsedInJavaScript": "工时日期", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时日期", - "GUID": "a3f2ccc5-af3a-4a07-954f-4473e507f377" + "GUID": "b2f20b17-9533-4c52-8be7-704cbb62da1d" } }, "18,9": { - "NameUsedInJavaScript": "工时类型", - "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时类型", - "GUID": "c1d027dc-2a55-4af5-a4fb-66924ea0956d" - } - }, - "18,11": { "NameUsedInJavaScript": "执行人", "BindingInfo": { - "TableName": "任务工时表", + "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "045e4c2d-ae5f-4c0e-8ae0-863748e988ff", + "GUID": "8e3a841f-9458-4490-8f08-f9238fc29b87", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 1 } } }, - "18,13": { - "NameUsedInJavaScript": "工时", + "18,11": { + "NameUsedInJavaScript": "上报工时", "BindingInfo": { - "TableName": "任务工时表", - "ColumnName": "工时", - "GUID": "e477ad89-15cf-47a0-ad44-39ee7b572449" + "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_任务工时统计", + "ColumnName": "核定工时", + "GUID": "3b9c1e60-eaca-4554-a1a0-1bc66696cbc6" } } }, @@ -721,6 +715,9 @@ }, { "HorizontalAlignment": 2 + }, + { + "FontSize": -1.0 } ], "Types": { @@ -751,6 +748,7 @@ "1,30": 1, "1,31": 0, "3,1": 2, + "17,5": 0, "17,7": 0, "17,8": 0, "17,9": 0, @@ -759,6 +757,33 @@ "17,12": 0, "17,13": 0, "17,14": 0, + "17,18": 3, + "17,19": 3, + "17,20": 3, + "17,21": 3, + "17,22": 3, + "17,23": 3, + "17,24": 3, + "17,25": 3, + "17,26": 3, + "17,27": 3, + "17,28": 3, + "17,29": 3, + "17,30": 3, + "17,31": 3, + "17,32": 3, + "17,33": 3, + "17,34": 3, + "17,35": 3, + "17,36": 3, + "17,37": 3, + "17,38": 3, + "17,39": 3, + "17,40": 3, + "17,41": 3, + "17,42": 3, + "17,43": 3, + "18,5": 0, "18,7": 0, "18,8": 0, "18,9": 0, @@ -766,7 +791,33 @@ "18,11": 0, "18,12": 0, "18,13": 0, - "18,14": 0 + "18,14": 0, + "18,18": 3, + "18,19": 3, + "18,20": 3, + "18,21": 3, + "18,22": 3, + "18,23": 3, + "18,24": 3, + "18,25": 3, + "18,26": 3, + "18,27": 3, + "18,28": 3, + "18,29": 3, + "18,30": 3, + "18,31": 3, + "18,32": 3, + "18,33": 3, + "18,34": 3, + "18,35": 3, + "18,36": 3, + "18,37": 3, + "18,38": 3, + "18,39": 3, + "18,40": 3, + "18,41": 3, + "18,42": 3, + "18,43": 3 }, "SheetStyle": { "FontFamily": 0, @@ -775,8 +826,6 @@ }, "Spans": [ "3,1,13,43", - "18,1,1,2", - "18,3,1,2", "1,1,1,2", "1,13,1,2", "1,15,1,14", @@ -785,20 +834,22 @@ "21,1,1,3", "21,4,1,3", "1,40,1,4", - "18,7,1,2", - "18,9,1,2", - "18,11,1,2", - "18,13,1,2", - "18,5,1,2", - "1,30,1,2", - "1,32,1,6", + "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", "17,9,1,2", + "18,11,1,2", "17,11,1,2", - "17,13,1,2" + "18,13,1,2", + "17,13,1,2", + "18,15,1,3", + "17,15,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -838,4 +889,4 @@ "Formula": "人员工时统计!$E$22" } ] -}//HH6GKrAktbHr3mfvc+5a6WstTUZv7YqvNyV75m1EyghkfV5zN5oB/2exBSC5+1x2nf8uM17rCVUlSX3yq+V3mQ9dwy7MDC3Yo52S8xb1AdXzmAx59PkQvJrwhfaN0G4Fr4plTdS4nEonr96hj9Nxe/OaDribBHjIJMv8P2zBXDV7ZpuD+8aR1U/Ro3rAXD94PrjCRcRr6QqcfvB85R+WfsIWGHTzuQOhO92CtnlAG4l2i9SRvt4/F0hfPTLLpYtGknfzIyzdLjpMvP41k9c0PPVykg9Yw5msw3ALm90FbrXLauHzMk2WMqIouuei01bzj4fdBmCK8+fzlOAozgDEz1l8l5E3ljScCTEKNeghzSoSJFVpWEpmdozNy0ZGcaNsDm/Ukg96IwiqHIPvxGPUn3SEtDl4403eEjJHeKnB9h/KKS1F4+lXoVU2vn2wAP2mfYo1DP4Ir1O3QythtKvzll4plFkG1vRzTm7B8ddcY57FznFY+GRGtvhVnaQ3DvPmtiau4n+ioOA9fMsRSvv0dM5x03I5AMdAoVDve6RaT81DgLrebY+/VEKxZLkUkUHk7GVoIy1zwhOMNgaLy47nkUHYnpn9sdZIrj8P41nloxw8dXxi4HmR5ruMExdVwhq0Z+Ee8qEMmLD+JqJKu8LHzUyvFQSPYKy1VzLpE/0O/p+oELyd1Ytr3anBkCOIKOLzCNPOdcvf9k/BOmSDDJGifGd9PuxbS/VclJNHGMuykDjUxd0BxK1IaWUFJGuJol0YMfLTGXgrcliIbPwmavrwthOtzkX8GzROg+YcFjHF/nmk5ygj+4sDx/crKt3+H4cD2R0Xz0ivQD8csDviPXKkARr4qyL2qEYI/ZDbnN4gJ9Bm2+InYUk6AYaVnKVbCk2nSYvmAzgHEzItUt5X4y2xlw==|920 \ No newline at end of file +}//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 diff --git a/Tables/工时/View_任务工时统计.json b/Tables/工时/View_任务工时统计.json index 4c6c9e32..8ff84f36 100644 --- a/Tables/工时/View_任务工时统计.json +++ b/Tables/工时/View_任务工时统计.json @@ -30,6 +30,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": "float", @@ -146,7 +153,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[请款单ID],\r\n\t\tISNULL([上报工时],0) AS 上报工时,\r\n\t\tROUND(SUM(CASE WHEN [工时类型] = '计划' THEN ISNULL([工时],0) ELSE 0 END),1) AS [计划工时],\r\n\t\tROUND(SUM(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\tGROUP BY \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[请款单ID],\r\n\t\t[上报工时]\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 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\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 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]", "ViewInfo": { "ViewName": "View_任务工时统计", "IsUpdatable": true,