diff --git a/.collaboration b/.collaboration
index ab00f9fa..78b4a4fb 100644
--- a/.collaboration
+++ b/.collaboration
@@ -2266,16 +2266,7 @@
   },
   {
     "ModuleName": "ServerCommandPrivate/Base根据汇报模板生成内容",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-09-04T08:19:08.7694119+08:00",
-    "ModuleType": 27,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\Base根据汇报模板生成内容.json"
-    ]
+    "ModuleType": 27
   },
   {
     "ModuleName": "ServerCommand/getEmployeeWorkHoursData",
diff --git a/ServerCommands/汇报/Base根据汇报模板生成内容.json b/ServerCommands/汇报/Base根据汇报模板生成内容.json
index 8955a0a3..e8849ad0 100644
--- a/ServerCommands/汇报/Base根据汇报模板生成内容.json
+++ b/ServerCommands/汇报/Base根据汇报模板生成内容.json
@@ -231,13 +231,22 @@
                           "TableName": "任务工时表",
                           "BindingInfos": [
                             {
-                              "GUID": "109c944c-b561-471c-98d7-a013cb305188",
+                              "GUID": "144a3c98-8ec5-456e-9882-a098061c5ee5",
                               "BindingInfo": {
                                 "TableName": "任务工时表",
                                 "ColumnName": "执行内容",
                                 "GUID": "0a31eb22-29b7-4138-a6a0-98d920d0f715"
                               },
                               "ColumnName": "工作内容"
+                            },
+                            {
+                              "GUID": "fd802a36-a4e1-4bf5-9c68-d4578e543755",
+                              "BindingInfo": {
+                                "TableName": "任务工时表",
+                                "ColumnName": "工时",
+                                "GUID": "78e5b879-a641-4c7b-a93f-a6385990e96e"
+                              },
+                              "ColumnName": "工时"
                             }
                           ],
                           "SqlCondition": {
@@ -293,7 +302,7 @@
                           },
                           "NullFormulaValueQueryPolicy": 0
                         },
-                        "ID": "1724b9cb79214e1e8af86bfb49938e9d"
+                        "ID": "4e4e013022224189aaf5893ea887e547"
                       },
                       {
                         "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
@@ -343,41 +352,6 @@
                     ],
                     "OutParamaterName": "数据源"
                   },
-                  {
-                    "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
-                    "OperationParamaterPairs": [
-                      {
-                        "Name": "汇报日期",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=处理汇报日期"
-                        }
-                      },
-                      {
-                        "Name": "汇报人",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=汇报人"
-                        }
-                      },
-                      {
-                        "Name": "总工时",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=总工时.总工时"
-                        }
-                      },
-                      {
-                        "Name": "汇报列表",
-                        "Value": {
-                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                          "SerializeProperty": "=汇报列表"
-                        }
-                      }
-                    ],
-                    "OutParamaterName": "数据源",
-                    "Disabled": true
-                  },
                   {
                     "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
                     "ParameterName": "查找模板",
@@ -386,7 +360,7 @@
                       "TableValueType": 1,
                       "BindingInfos": [
                         {
-                          "GUID": "d65d3c11-ebb1-4b7e-b8eb-ac58fbd7d5e2",
+                          "GUID": "17a3700d-7479-4b5c-929f-9c13fddc1c87",
                           "BindingInfo": {
                             "TableName": "汇报模板对应表",
                             "ColumnName": "模板ID",
@@ -432,7 +406,7 @@
                       "NullFormulaValueQueryPolicy": 0,
                       "TopCount": "1"
                     },
-                    "ID": "bf0cea8b763e46aeb807c216aeda31eb"
+                    "ID": "0c9432276f3e430fb8411d6a7e49f502"
                   },
                   {
                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -462,7 +436,7 @@
                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                               "SerializeProperty": "=数据源"
                             },
-                            "SetMaxRecursionDepth": 11,
+                            "SetMaxRecursionDepth": 10,
                             "ResultTo": "输出结果"
                           },
                           {
@@ -507,7 +481,7 @@
                             ]
                           }
                         ],
-                        "ID": "32ea446e-86d1-4b9d-962c-d05e90b54e9b"
+                        "ID": "d99a69b2-dada-466b-9438-7beb198fbf7e"
                       },
                       {
                         "CommandList": [
@@ -528,12 +502,12 @@
                             ]
                           }
                         ],
-                        "ID": "25509097-baec-4179-8265-caf71b1051e5"
+                        "ID": "d4f5036c-26c9-483f-b70c-fb1600445b4a"
                       }
                     ]
                   }
                 ],
-                "ID": "8b0a2877-f71d-4c6e-befa-3e5ac32503f5"
+                "ID": "dcf8e352-1cda-4ca6-8be2-fade4ad579b9"
               },
               {
                 "CommandList": [
@@ -557,7 +531,7 @@
                     ]
                   }
                 ],
-                "ID": "7e6028ac-1802-4295-abb3-7dcfb4533e83"
+                "ID": "30cd4c35-14a0-4ee1-8a41-0861c1ba52b8"
               }
             ]
           }