admin/clue
1
0
Fork 0
Code Pull Requests 1 Actions Activity

{"Message":"修改工时上报逻辑","MessageType":2,"Modules":[{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":1,"Name":"PCPage/任务工时统计"},{"State":1,"Type":1,"Name":"PCPage/收益中心-收益明细"},{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":1,"Name":"PCPage/项目分组详情"}],"Version":"v1"}

Browse Source
This commit is contained in:
SHAMUSPC\NINGMEI
2024-04-05 01:48:24 +08:00
parent d17e8cc189
commit 4651fbf196
9 changed files with 222 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Tables/工时/View_任务工时统计.json
View File

@@ -74,13 +74,6 @@
"Name": "上报工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"DatabaseColumnType": "float",
"MaxLength": -1,
"Name": "剩余工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
"DatabaseColumnType": "float",
@@ -116,18 +109,6 @@
"Name": "总实际工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
"BindingInfo": {
"TableName": "View_任务工时统计",
"ColumnName": "剩余工时",
"GUID": "c347ddb5-2b7d-48c8-a908-d219274fe3a1"
},
"AggregateFunction": 4,
"DataColumnName": "剩余工时",
"Name": "总剩余工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
"Formula": "IF([实际工时]=0,0,IF([计划工时]=0,100,ROUND([实际工时]/[计划工时]*100,0)))",
@@ -157,6 +138,24 @@
"DataColumnName": "计算提成",
"Name": "总计算提成",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon",
"Formula": "[计划工时]-[实际工时]",
"Name": "剩余工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
"BindingInfo": {
"TableName": "View_任务工时统计",
"ColumnName": "剩余工时",
"GUID": "bbc23449-d6da-4c22-899f-224b6f5b372f"
},
"AggregateFunction": 4,
"DataColumnName": "剩余工时",
"Name": "总剩余工时",
"ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
}
],
"ExternalDatabaseInfo": {
@@ -164,7 +163,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\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 c1.[ID],\r\n [工时日期] as 日期,\r\n\t\t[执行人],\r\n [项目ID],\r\n [任务ID],\r\n [时薪单价],\r\n [提成系数],\r\n [计划工时],\r\n [实际工时],\r\n\t\t[上报工时],\r\n\t\t[计划工时]-[实际工时] as 剩余工时,\r\n ([实际工时]*[时薪单价] * [提成系数]) as 计算提成,\r\n\t\tc1.[请款单ID],\r\n\t\tqk.[状态] as 请款状态\r\nFROM c1\r\n LEFT JOIN [收益请款单表] qk ON c1.请款单ID = qk.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[请款单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\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 c1.[ID],\r\n [工时日期] as 日期,\r\n\t\t[执行人],\r\n [项目ID],\r\n [任务ID],\r\n [时薪单价],\r\n [提成系数],\r\n [计划工时],\r\n [实际工时],\r\n\t\t[上报工时],\r\n ([实际工时]*[时薪单价] * [提成系数]) as 计算提成,\r\n\t\tc1.[请款单ID],\r\n\t\tqk.[状态] as 请款状态\r\nFROM c1\r\n LEFT JOIN [收益请款单表] qk ON c1.请款单ID = qk.ID;",
"ViewInfo": {
"ViewName": "View_任务工时统计",
"IsUpdatable": true,