{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":18,"Name":"RdlReport/人员工时报表"},{"State":1,"Type":18,"Name":"RdlReport/项目工时报表"}],"Version":"v1"}

.collaboration

@@ -122,16 +122,7 @@
   },
   {
     "ModuleName": "TableView/View_任务工时统计",
-    "State": 1,
+    "ModuleType": 23
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-17T15:31:36.0264024+08:00",
-    "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\工时\\View_任务工时统计.json"
-    ]
   },
   {
     "ModuleName": "Tables/需求反馈",
@@ -2479,17 +2470,7 @@
   },
   {
     "ModuleName": "RdlReport/人员工时报表",
-    "State": 1,
+    "ModuleType": 18
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-17T15:25:41.8310843+08:00",
-    "ModuleType": 18,
-    "ToRemoveFiles": [
-      "Reports\\人员工时报表.json",
-      "Reports\\人员工时报表.rdlx"
-    ]
   },
   {
     "ModuleName": "RdlReport/客户工时报表",
@@ -2497,16 +2478,6 @@
   },
   {
     "ModuleName": "RdlReport/项目工时报表",
-    "State": 1,
+    "ModuleType": 18
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-17T15:26:13.914225+08:00",
-    "ModuleType": 18,
-    "ToRemoveFiles": [
-      "Reports\\项目工时报表.json",
-      "Reports\\项目工时报表.rdlx"
-    ]
   }
 ]

Reports/人员工时报表.json

@@ -8,7 +8,7 @@
         "TableName": "View_任务工时统计",
         "BindingInfos": [
           {
-            "GUID": "436cda2c-a722-4bec-8ed9-d207cb7695d1",
+            "GUID": "8d0eb2ed-1f6f-42b0-9552-e787757e0bcf",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "日期",
@@ -17,7 +17,7 @@
             "ColumnName": "日期"
           },
           {
-            "GUID": "95c0df17-e05f-4951-ac27-e7dbe1e71e92",
+            "GUID": "458c5898-0f49-4761-af64-d39437d927f5",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "执行人",
@@ -30,7 +30,7 @@
             "ColumnName": "执行人"
           },
           {
-            "GUID": "0dc4cb02-e1e6-4be9-b01f-f88d500ee50a",
+            "GUID": "168d4b1c-ad1c-4ed4-8a8a-9b1f0d8abef1",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "执行人",
@@ -39,7 +39,7 @@
             "ColumnName": "执行人用户名"
           },
           {
-            "GUID": "5dc1a5de-f96c-470c-9849-3120e8cb61fc",
+            "GUID": "11b24757-091f-4c3f-885b-a5bb96110d45",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "项目ID",
@@ -48,7 +48,7 @@
             "ColumnName": "项目ID"
           },
           {
-            "GUID": "93413d04-203b-4e9f-a8d9-11ec9b377086",
+            "GUID": "ec561d94-2ce4-44ca-9ad0-770d7d23b511",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "项目ID",
@@ -62,7 +62,7 @@
             "ColumnName": "项目"
           },
           {
-            "GUID": "17d02ae0-2ad1-4edd-a07e-508393adf86c",
+            "GUID": "316c6302-f659-41cb-a02d-b337d38c0c81",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "任务ID",
@@ -76,7 +76,7 @@
             "ColumnName": "版本ID"
           },
           {
-            "GUID": "90ada791-e8fd-4a70-9c68-7427d8372bba",
+            "GUID": "40a55f2a-6468-444b-b01b-af0c094ff79a",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "任务ID",
@@ -95,7 +95,7 @@
             "ColumnName": "版本名称"
           },
           {
-            "GUID": "3d0575e2-5162-4a14-a8c6-718abf57c8ed",
+            "GUID": "840de559-a90e-435b-a60e-9a39e15b71c4",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "任务ID",
@@ -104,21 +104,16 @@
             "ColumnName": "任务ID"
           },
           {
-            "GUID": "4ef8d28c-06f4-472d-95a0-0fca170078bb",
+            "GUID": "970b2419-fb81-4402-81b1-b1e19973107c",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
-              "ColumnName": "任务ID",
+              "ColumnName": "任务名称",
-              "GUID": "825456f4-f846-4a2a-a415-3920d7d4be48",
+              "GUID": "b3b18e1e-a0fc-45f9-9151-c7fbd7d36853"
-              "RelationBinding": {
-                "RelatedTable": "任务表",
-                "RelatedColumn": "ID",
-                "DisplayColumn": "任务名称"
-              }
             },
-            "ColumnName": "任务"
+            "ColumnName": "任务名称"
           },
           {
-            "GUID": "01a18a60-f00f-414b-9145-13ca241e0c85",
+            "GUID": "c1509e20-ee2f-4f76-ab68-4650f5f03fdc",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "总上报工时",
@@ -127,7 +122,7 @@
             "ColumnName": "总上报工时"
           },
           {
-            "GUID": "ef72e335-973b-4373-be46-9989f1009bb9",
+            "GUID": "f3916a30-23a8-448a-9876-5f36849ef69b",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "总核定工时",

Reports/项目工时报表.json

@@ -80,7 +80,7 @@
         "TableName": "View_任务工时统计",
         "BindingInfos": [
           {
-            "GUID": "f769ed8e-d10c-47d0-ac37-05c05a7b3d4e",
+            "GUID": "b6a11bc4-ea31-4443-bf25-7239a41b4853",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "日期",
@@ -89,7 +89,7 @@
             "ColumnName": "日期"
           },
           {
-            "GUID": "246d254b-3165-4602-9f71-7a9542898113",
+            "GUID": "4b0309db-c521-425b-a14b-1388ec8e6689",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "项目ID",
@@ -98,30 +98,7 @@
             "ColumnName": "项目ID"
           },
           {
-            "GUID": "8e1ce463-9e1a-43ec-88e7-7ae2ed04b0de",
+            "GUID": "12973468-2bb6-4952-a376-94b60cd228fb",
-            "BindingInfo": {
-              "TableName": "View_任务工时统计",
-              "ColumnName": "任务ID",
-              "GUID": "74c2fc0e-4dec-4285-844f-d07e16d5bd8b"
-            },
-            "ColumnName": "任务ID"
-          },
-          {
-            "GUID": "d08c0cca-b87f-4931-a9df-17906570eccc",
-            "BindingInfo": {
-              "TableName": "View_任务工时统计",
-              "ColumnName": "任务ID",
-              "GUID": "5809be93-2eda-463d-95d1-69364ab26756",
-              "RelationBinding": {
-                "RelatedTable": "任务平行视图",
-                "RelatedColumn": "ID",
-                "DisplayColumn": "版本"
-              }
-            },
-            "ColumnName": "版本ID"
-          },
-          {
-            "GUID": "371c3a20-5957-418c-a90f-e9a3f11c11ed",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "项目名称",
@@ -130,7 +107,16 @@
             "ColumnName": "项目名称"
           },
           {
-            "GUID": "9ed038ce-4b1f-4b0f-aedb-b0602236c9e3",
+            "GUID": "cb7d89c0-2e63-41fe-8888-987922cadd58",
+            "BindingInfo": {
+              "TableName": "View_任务工时统计",
+              "ColumnName": "任务ID",
+              "GUID": "74c2fc0e-4dec-4285-844f-d07e16d5bd8b"
+            },
+            "ColumnName": "任务ID"
+          },
+          {
+            "GUID": "9ba02125-e7d6-4a26-829d-ffe1f8c55608",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "任务ID",
@@ -149,30 +135,21 @@
             "ColumnName": "版本名称"
           },
           {
-            "GUID": "2566704f-32b9-4379-a870-f09e85c79a41",
+            "GUID": "1f231ae4-51a5-4be9-a261-70845d5f9b81",
-            "BindingInfo": {
-              "TableName": "View_任务工时统计",
-              "ColumnName": "任务名称",
-              "GUID": "f3f10905-1688-4c17-942d-6deb109efa2d"
-            },
-            "ColumnName": "任务名称"
-          },
-          {
-            "GUID": "e481adf9-970f-4912-a0a1-1c23aeb4e47f",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "任务ID",
-              "GUID": "c1752c6f-7efc-44a2-acd7-844ea5e95c40",
+              "GUID": "5809be93-2eda-463d-95d1-69364ab26756",
               "RelationBinding": {
                 "RelatedTable": "任务平行视图",
                 "RelatedColumn": "ID",
-                "DisplayColumn": "任务说明"
+                "DisplayColumn": "版本"
               }
             },
-            "ColumnName": "任务说明"
+            "ColumnName": "版本ID"
           },
           {
-            "GUID": "0cffe8ab-1e70-4a2f-9bc8-614eb930bf2c",
+            "GUID": "c1671739-a993-42a0-a981-3f1bd23b0058",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "执行人",
@@ -185,25 +162,34 @@
             "ColumnName": "执行人"
           },
           {
-            "GUID": "28744cb3-cf7e-4a34-a573-9f4979279f5a",
+            "GUID": "853cc099-b3cf-45d7-90d5-0e94daf563f3",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
-              "ColumnName": "执行内容",
+              "ColumnName": "任务名称",
-              "GUID": "8c813fd0-cee4-4da3-93df-a24aa9e71ed1"
+              "GUID": "f3f10905-1688-4c17-942d-6deb109efa2d"
             },
-            "ColumnName": "执行内容"
+            "ColumnName": "任务名称"
           },
           {
-            "GUID": "65a814b4-cc42-42cc-a93a-d73488380218",
+            "GUID": "fa5c3c7e-ba75-419b-87b1-a7b0f74a3b25",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
-              "ColumnName": "总计划工时",
+              "ColumnName": "任务说明",
-              "GUID": "16f19bcd-5101-47bf-a65a-b0be98d9ebae"
+              "GUID": "89ab2fbe-f086-4e89-9ed3-72be3ac4f39d"
             },
-            "ColumnName": "总计划工时"
+            "ColumnName": "任务说明"
           },
           {
-            "GUID": "82853999-23d5-40de-958c-4b67638af576",
+            "GUID": "7529d072-7716-4b79-a647-9a3e3a28e80c",
+            "BindingInfo": {
+              "TableName": "View_任务工时统计",
+              "ColumnName": "总上报工时",
+              "GUID": "d05e8310-7aa0-43fc-be55-c39187495b73"
+            },
+            "ColumnName": "总上报工时"
+          },
+          {
+            "GUID": "685da16c-a43e-46cc-9579-b4d44312e960",
             "BindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "总核定工时",
@@ -211,16 +197,25 @@
             },
             "ColumnName": "总核定工时"
           }
-        ]
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "CompareType": 2,
+          "ColumnBindingInfo": {
+            "TableName": "View_任务工时统计",
+            "ColumnName": "上报工时",
+            "GUID": "91281664-cf87-4b9a-9ed1-900f865f7ce3"
+          },
+          "Value": "0"
+        }
       },
       "ColumnsType": [
         "date-time",
         "integer",
-        "integer",
+        "string",
         "integer",
         "string",
-        "string",
+        "integer",
-        "string",
         "string",
         "string",
         "string",

Tables/工时/View_任务工时统计.json

@@ -44,6 +44,13 @@
       "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": "nvarchar",
@@ -51,6 +58,14 @@
       "Name": "执行内容",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
+    {
+      "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
+      "Required": true,
+      "DatabaseColumnType": "varchar",
+      "MaxLength": -1,
+      "Name": "FGC_Creator",
+      "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
     {
       "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon",
       "DatabaseColumnType": "float",
@@ -167,7 +182,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\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.[任务名称]",
+    "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\trw.[任务说明],\r\n\t\tSTRING_AGG(c1.[执行内容], CHAR(13) + CHAR(10)) AS 执行内容,\r\n\t\tFGC_Creator='Administrator',\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\nrw.[任务说明],\r\nc1.[任务ID],\r\nrw.[任务名称]",
     "ViewInfo": {
       "ViewName": "View_任务工时统计",
       "IsUpdatable": true,