diff --git a/.collaboration b/.collaboration index fe4d91b9..e1c3cfb1 100644 --- a/.collaboration +++ b/.collaboration @@ -144,16 +144,7 @@ }, { "ModuleName": "TableView/人员工时统计视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:49:15.7615454+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\人员工时统计视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/任务工时表", @@ -264,19 +255,6 @@ "ModuleName": "Table/汇报记录表", "ModuleType": 7 }, - { - "ModuleName": "TableView/成员计划内容合并视图", - "State": 2, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:50:10.3778565+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\汇报\\成员计划内容合并视图.json" - ] - }, { "ModuleName": "Table/message_test", "ModuleType": 7, @@ -304,16 +282,7 @@ }, { "ModuleName": "TableView/成员收益分类汇总视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T20:17:35.8622204+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\收益\\成员收益分类汇总视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Tables/财务", @@ -841,17 +810,7 @@ }, { "ModuleName": "PCPage/人员工时统计", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:49:15.7616254+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工时\\人员工时统计.json", - "Pages\\工时\\人员工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人工时首页", @@ -951,17 +910,7 @@ }, { "ModuleName": "UserControlPage/收益数据横幅", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T19:58:38.6554455+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\收益数据横幅.json", - "UserControlPages\\收益数据横幅.rd" - ] + "ModuleType": 31 }, { "ModuleName": "UserControlPage/输入框", @@ -2105,16 +2054,7 @@ }, { "ModuleName": "ServerCommand/删除请款单", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T20:18:54.6305118+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\收益\\删除请款单.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/生成结算申请单", diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json index 4048d7f5..532fd11b 100644 --- a/Pages/工时/人员工时统计.json +++ b/Pages/工时/人员工时统计.json @@ -392,7 +392,7 @@ }, "BindingInfo": { "TableName": "人员工时统计视图", - "ColumnName": "总实际工时", + "ColumnName": "总核定工时", "GUID": "b9a7fc9b-8f5e-4440-8c7b-631a9ba25280" } }, @@ -412,7 +412,7 @@ }, "BindingInfo": { "TableName": "人员工时统计视图", - "ColumnName": "总计算提成", + "ColumnName": "总核定收益", "GUID": "fa541705-7c4d-4799-ac32-7acdc787f6af" } } @@ -481,14 +481,14 @@ "2,4,1,3", "2,16,1,3", "2,13,1,3", + "2,7,1,3", + "2,10,1,3", "1,1,1,3", "1,4,1,3", - "1,13,1,3", - "1,16,1,3", - "2,7,1,3", "1,7,1,3", - "2,10,1,3", - "1,10,1,3" + "1,10,1,3", + "1,13,1,3", + "1,16,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -514,4 +514,4 @@ "PaperSize": {}, "Margin": {} } -}//aAYAslZpSPI/KwZ01OQQdLwNE0/9aVw8wjnuOrrhkbJvIZ6OmZJQ1WH47z7brqnAlEbcs0eUfToAB4Z+ooMWeSCvQIi07/j9X4MULEIXEktovmMegLIvf0Gk8y4L89OBRBGd9zEZWxPf6/Sn5smmcP4oXCCz9yuM9r4bOoLbkJum30OUqq6OBsBrfyw8lIUBahn5/26yZ7jAUoNdWSFN57KBZLHgncEbI4Bzo/BwIWF4LNUdmNhNgILJdsyG7KgVhAizCe1+vnVk/7MlDnvAfJ9FZQlCeRLNOS+xTw+9oM0lp0v/ZLl+W1p1tZwoLiDIb6rFf7QOJv03wfY+KUaRgIzZhMfl/OSo33XF5X9VT9Y1LG7VEFKzWN5E/3+nv0OPWJYc2vWWj3Gq7GnbzchhcMCXrTmLwFmiD6YZGnL2RDAQW75jeNyGIOiAAQQ5DotrPGrNMIHisOUbo2bfP5RKhvpFAv4rtGYlbGER0p5nvrMxT+7rhi4VGOfkC1uvp7fUhHYtMZjGB/BmXznsB/gpUeqQUNtqiQtyMFLYQ6BMrmJe+rJ5i/BLMDv/Oiik8efKSzu+jjkloG969D7gpwFq2Lbpn5oH1hhYshKDkRv8EG9l9MwbgvjQOpwI9urppDnfEtr95ADhmlCpBid2lCbk9qI7ZZC80MBQ5YEbG7lQ60BG+mSvnlzTpYb5WIfiQEhH8/WXneh6jehxo2slOJmJomwefYucUeVtzjHdTGw+kXsRQ0VGGHE/T0Or7TU2yUXifAfmMnA1a6rGRI6S4V66eArkmWkSe7uh4Jc2S3G+C1HmqWEBjkkodwm1Gqwemi1rANCRRohV64OLoflIFt/3dA42wa7oeFaI8iWBxPtDMl/DDqsCz3sC0qPWbOIPmgoQVEP1k5WsmCqzf1+3W4hq0g==|920 \ No newline at end of file +}//vmfMY+m4p4LQG3fhapguRlwtMIrpOyEpih6irg/m8Z0zSg8IYIwdUDQXFgrcon3TwM398tz06+f7k6iCG2kRMsz3Rrz6bp4e/kZLfTUqnPUI2OJ4k8wR9F0LyU5guEfyPXHiMTD6H4D4/emlTrq/Gh3k0GQaEnvGuzHJbMbwbTsGq+uoU6uN7cCqZOx/OQDNNEGcsQ1Og76fd52kNaUJWVPv2QPhpWOi1DQkuF9vVfEc1plXBf5lVw36AH5rhmUQr/G8x/6OE/2QuTlFJZX/bVDtPRmw64uDo4MDajOAjCihDPYchvIBrPcLfAIltjFZu5vNW+McIuqLct3xb+m8CCj28WIx/ixKvecym49xe1ZlWCB4XqVp0+IxSa4oNoLsJOxlt4VDXOAXkXMdpWks8JqCoiQTmrDWWJjdB9zAcjWcfCQQPu0oNCM6z570ymvdSD+9032pUt47vljRQt1a9eR/Gkp9Gx+FjPDfSSjMj8iqWdZDWG88WRPQgrrVNIv4MXWd3CQpklFYMzGe5wjdCj3XY8venOLpbmN8FN90HIIyc6G/Pbib8EKDeWPFcGLkbhJooJm1knitOaN/yJNRW1JpGTeVDHceQidn0/QboLKSBTI2mqIvrsLanIPYdm/VIQA/qbc+urN+QyxUH1DwF9wTPmMMR/djsfT502U/S02f9LCdQ4V/So4kqwnt4sTOutcS8URS9LmCCeu72f/tzeYaBMyx6jKoNT47z8yHXoVOHOUL9xXknAXrEs/iQuwPTxdx/lsDLWPf+E6roR4H5F1ECBZ10q/uA/a6V1RqdcO+ZMxOQyeEqZDad4Ik3eTjrpxkoAiEVDdK7bSLumZA5EfTbc+Oi+MLJ02Pjby6MeyJmQCF7vZ+WPT+5BSlKSEgd5//r34g6lfrW9plOuxrfw==|920 \ No newline at end of file diff --git a/ServerCommands/收益/删除请款单.json b/ServerCommands/收益/删除请款单.json index 935a8202..8f92c3b7 100644 --- a/ServerCommands/收益/删除请款单.json +++ b/ServerCommands/收益/删除请款单.json @@ -40,7 +40,7 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "e9969098-818e-4750-9f5b-ebdd22d6d6bf", + "GUID": "8682e42f-40e1-4d69-bf63-57c534fea59f", "BindingInfo": { "TableName": "收益请款单表", "ColumnName": "流程实例ID", @@ -49,7 +49,7 @@ "ColumnName": "流程实例ID" }, { - "GUID": "92196a03-fb15-4f55-b732-cfb0378dbb48", + "GUID": "c3f46a55-01b8-4a3d-96bc-57a4fff7d1e3", "BindingInfo": { "TableName": "收益请款单表", "ColumnName": "状态", @@ -58,7 +58,7 @@ "ColumnName": "状态" }, { - "GUID": "e62b17f8-8bc4-4908-81dd-2bca97df0c05", + "GUID": "767bd869-cf60-481a-8a76-59f3c92128f5", "BindingInfo": { "TableName": "收益请款单表", "ColumnName": "付款凭证ID", @@ -81,7 +81,7 @@ }, "TopCount": "1" }, - "ID": "d91326c4deea4be8817128ba26487d73" + "ID": "c40e234c4d1d476d8880177218ef5549" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -183,16 +183,58 @@ "SerializeProperty": "=请款单ID" } } + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "付款凭证表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "付款凭证表", + "ColumnName": "ID", + "GUID": "9ecff31a-0180-4597-accf-c1cd00144147" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.付款凭证ID" + } + } } ] }, { - "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", - "ProcessInstanceId": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=请款单.流程实例ID" - }, - "OperateType": 301 + "$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": "=请款单.流程实例ID" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon", + "ProcessInstanceId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=请款单.流程实例ID" + }, + "OperateType": 301 + } + ], + "ID": "89ac583d-d486-45cf-bb4d-563fc03d2bfd" + } + ] }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -200,7 +242,7 @@ "Message": "请款单已删除" } ], - "ID": "11e8fb08-4b26-45f5-8623-b43c4802896f" + "ID": "5eb6a93b-0139-4add-8899-3ae38f9c8333" }, { "CommandList": [ @@ -210,12 +252,12 @@ "Message": "请款单未终止或已结款，无法撤销！" } ], - "ID": "5c7c5ef7-cffd-4818-8a6f-71bbdfdce2b1" + "ID": "1246b254-4f7e-4fef-8ccf-c3404a95f9f1" } ] } ], - "ID": "8c653230-3bf5-47c9-b5aa-cbd237c820c8" + "ID": "bb6ffe2b-cdfa-461b-b11c-07c9e6339219" }, { "CommandList": [ @@ -225,7 +267,7 @@ "Message": "请款单不存在" } ], - "ID": "7bae4efe-28e9-4486-843a-641e63f74419" + "ID": "4081b537-d2ce-4452-aedf-c8fde875c08b" } ] } diff --git a/Tables/工时/人员工时统计视图.json b/Tables/工时/人员工时统计视图.json index b120c122..e6cba2cc 100644 --- a/Tables/工时/人员工时统计视图.json +++ b/Tables/工时/人员工时统计视图.json @@ -27,7 +27,7 @@ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "float", "MaxLength": -1, - "Name": "实际工时", + "Name": "核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -41,7 +41,7 @@ "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "float", "MaxLength": -1, - "Name": "计算提成", + "Name": "核定收益", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -60,12 +60,12 @@ "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { "TableName": "人员工时统计视图", - "ColumnName": "实际工时", - "GUID": "114c527c-7ea2-4f6d-817b-309e1744e426" + "ColumnName": "核定工时", + "GUID": "5d629323-b686-470a-8e62-2d424af1fc66" }, "AggregateFunction": 4, - "DataColumnName": "实际工时", - "Name": "总实际工时", + "DataColumnName": "核定工时", + "Name": "总核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { @@ -84,12 +84,12 @@ "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { "TableName": "人员工时统计视图", - "ColumnName": "计算提成", - "GUID": "40e93639-f407-4945-8f49-da398870d97b" + "ColumnName": "核定收益", + "GUID": "359f0bce-f840-4eb5-a67e-38e6e667fc65" }, "AggregateFunction": 4, - "DataColumnName": "计算提成", - "Name": "总计算提成", + "DataColumnName": "核定收益", + "Name": "总核定收益", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], @@ -98,7 +98,7 @@ "ConnectionId": "业务表", "SourceTableName": "人员工时统计视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\r\n[执行人],\r\nCAST([日期] as date) 日期,\r\nSUM([计划工时]) AS 计划工时,\r\nSUM([实际工时]) AS 实际工时,\r\nSUM([上报工时]) AS 上报工时,\r\nSUM([计算提成]) AS 计算提成\r\nFROM [View_任务工时统计] t\r\nGROUP BY\r\n[执行人],\r\n[日期]", + "CreateViewSql": "SELECT\r\n[执行人],\r\nCAST([日期] as date) 日期,\r\nSUM([计划工时]) AS 计划工时,\r\nSUM([核定工时]) AS 核定工时,\r\nSUM([上报工时]) AS 上报工时,\r\nSUM([核定收益]) AS 核定收益\r\nFROM [View_任务工时统计] t\r\nGROUP BY\r\n[执行人],\r\n[日期]", "ViewInfo": { "ViewName": "人员工时统计视图", "IsUpdatable": true, diff --git a/Tables/收益/成员收益分类汇总视图.json b/Tables/收益/成员收益分类汇总视图.json index 49c05717..bd91e664 100644 --- a/Tables/收益/成员收益分类汇总视图.json +++ b/Tables/收益/成员收益分类汇总视图.json @@ -13,29 +13,32 @@ "$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", - "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", - "MaxLength": -1, - "Name": "办理中", + "Name": "总收益", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, "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", + "Required": true, + "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", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "未结算", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -43,7 +46,7 @@ "ConnectionId": "业务表", "SourceTableName": "成员收益分类汇总视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH c1 as (\r\nSELECT\r\n[执行人] as 成员,\r\n[请款状态],\r\nzt.[状态],\r\n[计算提成] as 总金额,\r\n(CASE WHEN ISNULL([请款状态], 0)=0 or [请款状态]=4 THEN [计算提成] ELSE 0 END) as 待结算,\r\n(CASE WHEN [请款状态]=1 or [请款状态]=2 THEN [计算提成] ELSE 0 END) as 办理中,\r\n(CASE WHEN [请款状态]=3 THEN [计算提成] ELSE 0 END) as 已结算\r\nFROM [View_任务工时统计] t\r\nLEFT JOIN [请款单状态] zt ON t.[请款状态] = zt.状态码\r\n)\r\n\r\nSELECT\r\n[成员],\r\nSUM(总金额) as 总金额,\r\nSUM(待结算) as 待结算,\r\nSUM(办理中) as 办理中,\r\nSUM(已结算) as 已结算\r\nFROM c1\r\nGROUP BY\r\n[成员]", + "CreateViewSql": "WITH u AS (\r\n\t\tSELECT\r\n\t\t[执行人] AS [成员],\r\n SUM(ISNULL([时薪单价], 0) * ISNULL([提成系数], 1) * ISNULL([工时], 0)) AS 总收益\r\n FROM [任务工时表]\r\n\t\tGROUP BY [执行人]\r\n),\r\nsy_sum AS (\r\n SELECT \r\n\t\t[请款人] AS 成员, \r\n\t\tSUM(ISNULL([请款金额], 0)) AS 已结算\r\n FROM [收益请款单表]\r\n WHERE [状态] =3\r\n GROUP BY [请款人]\r\n),\r\nqkd_sum AS (\r\n SELECT \r\n\t\t[请款人] AS 成员,\r\n\t\tSUM(ISNULL([请款金额], 0)) AS 结算中\r\n FROM [收益请款单表]\r\n WHERE [状态] <3\r\n GROUP BY [请款人]\r\n),\r\ngs_sum AS (\r\n SELECT \r\n\t\t[执行人] AS 成员, \r\n\t\tSUM(ISNULL([时薪单价], 0) * ISNULL([提成系数], 0) * ISNULL([工时], 0)) AS 未结算\r\n FROM [任务工时表]\r\n WHERE [请款单ID] IS NULL\r\n GROUP BY [执行人]\r\n)\r\nSELECT\r\n u.[成员],\r\n\t\tu.[总收益],\r\n ISNULL(sy_sum.已结算, 0) AS 已结算,\r\n ISNULL(qkd_sum.结算中, 0) AS 结算中,\r\n ISNULL(gs_sum.未结算, 0) AS 未结算\r\nFROM u\r\nLEFT JOIN sy_sum ON u.[成员] = sy_sum.[成员]\r\nLEFT JOIN qkd_sum ON u.[成员] = qkd_sum.[成员]\r\nLEFT JOIN gs_sum ON u.[成员] = gs_sum.[成员]", "ViewInfo": { "ViewName": "成员收益分类汇总视图", "IsUpdatable": true, diff --git a/Tables/汇报/成员计划内容合并视图.json b/Tables/汇报/成员计划内容合并视图.json deleted file mode 100644 index a4b1da9a..00000000 --- a/Tables/汇报/成员计划内容合并视图.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "Name": "成员计划内容合并视图", - "Columns": [ - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "序号", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, - "DatabaseColumnType": "varchar", - "MaxLength": -1, - "Name": "来源", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "date", - "MaxLength": -1, - "Name": "日期", - "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "项目ID", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "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", - "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", - "MaxLength": -1, - "Name": "总工时", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - } - ], - "ExternalDatabaseInfo": { - "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", - "AllowModifySchema": true, - "ConnectionId": "业务表", - "SourceTableName": "成员计划内容合并视图", - "SourceTableSchema": "dbo", - "CreateViewSql": "WITH 记录 AS(\r\nSELECT\r\n[来源]='日报',\r\nCAST([汇报记录表].[开始日期] AS date) AS [日期],\r\n[汇报记录表].[汇报人] AS [成员],\r\n[汇报内容] AS [内容],\r\n[工时] AS [工时],\r\n[关联项目] AS [项目ID],\r\n[关联任务] AS [任务ID]\r\nFROM [汇报子表]\r\nLEFT JOIN [汇报记录表] ON [汇报子表].[汇报ID] = [汇报记录表].ID\r\nWHERE [汇报子表].汇报类型='计划' AND [汇报内容] IS NOT NULL\r\nUNION ALL\r\nSELECT\r\n[来源]='报工',\r\nCAST([工时日期] AS date) AS 日期,\r\n[执行人] AS 成员,\r\n[执行内容] AS 内容,\r\n[工时] AS [工时],\r\n[项目ID] AS [项目ID],\r\n[任务ID] AS [任务ID]\r\nFROM [任务工时表]\r\nWHERE [执行内容] is not NULL AND [工时类型]='实际'\r\n)\r\n\r\nSELECT\r\n ROW_NUMBER() OVER (ORDER BY [来源]) AS [序号],\r\n[来源],\r\n[日期],\r\n[项目ID],\r\n[任务ID],\r\n[成员],\r\nSTRING_AGG([内容], CHAR(13)+CHAR(10)) WITHIN GROUP (ORDER BY [日期]) AS 内容,\r\nSUM(工时) AS 总工时\r\nFROM 记录\r\nGROUP BY\r\n[日期],\r\n[项目ID],\r\n[任务ID],\r\n[成员],\r\n[来源]", - "ViewInfo": { - "ViewName": "成员计划内容合并视图", - "IsUpdatable": true, - "QueryColumns": [ - "序号" - ] - } - }, - "Indexes": [] -} \ No newline at end of file diff --git a/UserControlPages/收益数据横幅.json b/UserControlPages/收益数据横幅.json index 30c7cec4..406968fa 100644 --- a/UserControlPages/收益数据横幅.json +++ b/UserControlPages/收益数据横幅.json @@ -465,34 +465,34 @@ "TableValueType": 1, "BindingInfos": [ { - "GUID": "cb72cece-7dd9-4b90-b0f9-68f3c287f9a2", + "GUID": "78285f4c-9774-4b56-bf1e-7dca2cddab4e", "BindingInfo": { "TableName": "成员收益分类汇总视图", - "ColumnName": "总金额", - "GUID": "76a03426-dc20-468b-b119-1da4144e620b" + "ColumnName": "总收益", + "GUID": "658f1b92-2c33-474b-b733-e6f67cb6eaa3" }, - "ColumnName": "总金额" + "ColumnName": "总收益" }, { - "GUID": "938a1ad2-d1c4-4bac-9ad4-017efb70c531", + "GUID": "9429ed59-22d6-4ea3-95f8-8524fbb9a991", "BindingInfo": { "TableName": "成员收益分类汇总视图", - "ColumnName": "待结算", - "GUID": "5ebe643f-b33f-47f3-87b0-6e4f8cdca203" + "ColumnName": "未结算", + "GUID": "9c70ba08-cde1-4729-80d2-856ba88f4361" }, - "ColumnName": "待结算" + "ColumnName": "未结算" }, { - "GUID": "f37dfbec-4d96-4d1b-86b9-1e519e193e1c", + "GUID": "af3436ae-a069-4ac2-a647-7d062b8550b9", "BindingInfo": { "TableName": "成员收益分类汇总视图", - "ColumnName": "办理中", - "GUID": "8c633d3a-453a-42b2-9a64-65503bea7ee7" + "ColumnName": "结算中", + "GUID": "d97888e4-8b22-4aaa-8a8e-09b1d60bda99" }, - "ColumnName": "办理中" + "ColumnName": "结算中" }, { - "GUID": "fcf49e6d-b13e-44ad-a8f8-39fc4981eaa4", + "GUID": "c2cb06ae-348d-4dc8-b668-d19bebe140d3", "BindingInfo": { "TableName": "成员收益分类汇总视图", "ColumnName": "已结算", @@ -508,15 +508,12 @@ "ColumnName": "成员", "GUID": "5ec74a63-add5-4f1c-822d-7174f9a99ddc" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!C5" - } + "Value": "%CurrentUser.UserName%" }, "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "0b0434f2eb114c0bab7fcc933aa0db81" + "ID": "17a6382c4fe943b3aa5ff49a847078d7" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -543,21 +540,21 @@ "PropertyName": "总金额", "PropertyValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.总金额" + "SerializeProperty": "=收益数据横幅!查询数据.总收益" } }, { "PropertyName": "待结算", "PropertyValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.待结算" + "SerializeProperty": "=收益数据横幅!查询数据.未结算" } }, { "PropertyName": "办理中", "PropertyValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=收益数据横幅!查询数据.办理中" + "SerializeProperty": "=收益数据横幅!查询数据.结算中" } }, { @@ -570,7 +567,7 @@ ] } ], - "ID": "0a1132c8-2cd9-45aa-8009-4b46cb864c12" + "ID": "5523d73e-30a6-4e93-9d9f-1697dae4d945" }, { "CommandList": [ @@ -596,7 +593,7 @@ ] } ], - "ID": "557a27e6-6dce-4d39-93be-9941e405afae" + "ID": "8da4625d-5146-4817-a415-a1aaceae5eb3" } ] } @@ -624,4 +621,4 @@ "Size": "908,112" } ] -}//4FZ1syc+AqrSs6izrLzx6aZ4fSqeVD4ykT0Er2N/mGFtGVlfB2hYSkLf2X3kjnwfjsv7y5+ioFRkno8EdfRJnda9SYlj6ZXU9Dcw3fjLTNQD9UxzPJXXwHCWXhCQ0HEvy/BgJo7IIcrA/aDxkGWAEHc8TRxgMH4Kdkxz8C5dQnxvkhyKLsxpIjkmA8Rvb4ANXEJnj+IZ6vccO6KMK9UsAjXNWEybAH69rgsuGrOccj+C+b17c+ZN55TyTYB/h3uv26MdNy69KrTaAMB/r1HxHADmYeFAz5Lx9cZ6/m6u9bZgTRXthg/WsmYudltcpbWJzPBAIH85uXgcorJZ5kIkopPihNoHFgFBE/2TFyOSKKOf2JJxBAbZG7Cze9yS9ZUOi1hzYjtDv7CVnmB3V9790OFFcD3HAG3aOE45j5WPZVI+az9CIA/QRAelQbJsdB0EPnkQNguKtjMD6CRGl55pOA0Mk/wFJsHo329+3TKdHsTrzsYKtHIKhHnRR3e4FN0m8/ZqU+u3LA2BOwmYIuOweOsW1G0aTPnY8MFBFDunH0fsUddckOjg9vSqRaP2hQX/vqZvY9jfvOX95E7VgZwKb4lJelMY/YCc4vV6mdB32QGLB6K21XuSPRsWiY7UszRTmu0Zw+1zuwm0S/bN9EGxn/h5BuYUCu5Klc/WAZTnJWfjvyRbC8Me3Spa7Pz2XMZRAVd2+zbcUo5T0qY15uNDWbjUjZXAjxuYG6ibrnlEudcUakSEGBbOiwZ9t8bMLQsUPtMKEv2h50vHqP2oHs8Js8Y2QiNzpAuQfqM/WqeA6eBrTass2TXjfzIPRNboKT/14wGz1Z3/lWfpwIXrlm+eihxWmGLl89uMXIxlrlOxVw344MhxuVbTQ+mM5gz3joZmfHr5wIBIvAXoaUm4bdhiFQ==|920 \ No newline at end of file +}//cgC6DiqD9WEL6ctw+05smsLG7Nya/v+q6vMK0sGKh6EMjqqNOBBAEnpjBUPkah4vlz6XpFY027I/MzqDfRHoo+BqJHlVEUqJ5g8+I35vTayfTEV6wwlPiFF3cAh9Jwe/maEt2CL7MmGnwaCtM36O38NbIbaEGn5b7XPAukVeECkVXn3Y53ap/9X24Vl6fAilK4uktNbcVw1pw5tdPGnPqT+7wpDZLpEIjex/EIbcICvL3Un6plh3Zo8+LVPQuw2fYyqxun63dlqrIok86zry0n6VGAGLGRzLHvdvvWU6FtSCSXhsglFsHTDdBGaVkK/kpWgJTQoGq0/hI91jWUmLzE1EHFNNAW9G99xPfuV0szBci5GJ5cFvKZraoDm8zGoiYB9h7ltCjzGcWPchzKY4HGMKvLPZcP5iUFOUrO8eXBJDf2kkXQiKj+BcUv1hOj5goHY98UUvR5mdt5dVqAVkztnTOKR005MmRlxHBAgrUkzprasm7SQBRGK08UrhPHJ3oStI6cQnriML7iz/wUQW4eCqwT2GMFuZw3Hxb3SFc+8oYn5XfQ1HfB3F3PUbMqusA8jqeRQHKzXGB/Z4bD5DLWF9CWRJ6K4G9li4TAwD+9uMyX2NWxyPx46X9SB307AecoPqcHMWfQIqy/0fHsScCvZP2uUynVIgoKOgrLuGPnD383Bf1E4w/SAXZ8dhwJ9XHfY+X7ViYccKcajOMeoe/Wb0n39y8ncC+RTjOinTGyHwq9zO+xol9OqDHHRTl00iMRpA1wphuyowWiOO9T3j+Vb0PH8SE6ANp9EzAR6jbTYAx+4oJ5X7OXY+YezK9DDkWHpv5a8Uj7n8wD5muARMdjSb8lfQ9CP5CjZtcMVxyO43iygTUxFdtqkSKmvUkOGNBgets8EOH5g3OB43hiTC6Q==|920 \ No newline at end of file