diff --git a/.collaboration b/.collaboration
index 2dc76dc2..a86b391d 100644
--- a/.collaboration
+++ b/.collaboration
@@ -830,17 +830,7 @@
   },
   {
     "ModuleName": "PCPage/审批结算申请单",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-30T21:30:49.9823843+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\收益\\审批结算申请单.json",
-      "Pages\\收益\\审批结算申请单.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/办理结算审批单",
@@ -1212,17 +1202,7 @@
   },
   {
     "ModuleName": "PCPage/人员工时统计",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-30T21:31:30.8988133+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\人员工时统计.json",
-      "Pages\\工时\\人员工时统计.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "MasterPages/流程母版页面文件夹",
@@ -1466,29 +1446,11 @@
   },
   {
     "ModuleName": "ServerCommandPrivate/自动生成昨日日报",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-30T21:42:27.1295752+08:00",
-    "ModuleType": 27,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\自动生成昨日日报.json"
-    ]
+    "ModuleType": 27
   },
   {
     "ModuleName": "ServerCommand/根据汇报模板生成内容",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-30T21:44:45.0843171+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\根据汇报模板生成内容.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "ServerCommand/批量生成日报",
@@ -1712,16 +1674,7 @@
   },
   {
     "ModuleName": "TaskScheduler/每日根据报工自动生成工作日报",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-30T21:42:10.3781005+08:00",
-    "ModuleType": 16,
-    "ToRemoveFiles": [
-      "SchedulerTasks\\定时任务\\每日根据报工自动生成工作日报.json"
-    ]
+    "ModuleType": 16
   },
   {
     "ModuleName": "RdlReport/工时报表",
@@ -2281,18 +2234,7 @@
   },
   {
     "ModuleName": "UserService",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-30T21:50:50.0038457+08:00",
-    "ModuleType": 11,
-    "ToRemoveFiles": [
-      "UserServiceDB.sqlite3",
-      "CloudStorageProvider\\data.json",
-      "SecurityProviderV2\\data.json"
-    ]
+    "ModuleType": 11
   },
   {
     "ModuleName": "CustomLibrary",
diff --git a/Pages/工时/人员工时统计.json b/Pages/工时/人员工时统计.json
index 2f00cbe6..7e0123f6 100644
--- a/Pages/工时/人员工时统计.json
+++ b/Pages/工时/人员工时统计.json
@@ -181,7 +181,7 @@
           "DesignLengthInPixel": 32.0
         }
       },
-      "30": {
+      "38": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0,
           "Mode": 2,
@@ -193,60 +193,46 @@
           }
         }
       },
-      "31": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "32": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "33": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "34": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "35": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "36": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "37": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
-      "38": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
       "39": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "40": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "41": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "42": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "43": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "44": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 15.0
         }
       }
     },
-    "Count": 40,
+    "Count": 45,
     "DefaultSize": 32.0
   },
   "Values": {
     "1,1": "成员",
     "1,13": "日期",
-    "1,35": "导出原始数据",
-    "17,9": "执行人"
+    "1,30": "日期",
+    "1,40": "导出原始数据",
+    "17,11": "执行人"
   },
   "AttachInfos": {
     "1,3": {
@@ -317,11 +303,14 @@
         },
         "placeholder": "请选择",
         "noDataText": "无数据",
+        "multiple": true,
+        "collapseTags": true,
         "filterInServerOptions": {
           "matchMethod": "contains",
           "loadingText": "加载中"
         },
-        "noMatchText": "无匹配数据"
+        "noMatchText": "无匹配数据",
+        "clearable": true
       }
     },
     "1,15": {
@@ -377,17 +366,42 @@
         "endPlaceholder": "结束日期",
         "format": "yyyy年MM月DD日",
         "firstDayOfWeek": 1,
+        "clearable": true,
         "DefautWeekFormat": "yyyy 第 WW 周"
       }
     },
-    "1,35": {
+    "1,32": {
+      "CellType": {
+        "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon",
+        "Style": 1,
+        "Items": [
+          {
+            "Value": "全部",
+            "DisplayValue": "全部"
+          },
+          {
+            "Value": "计划",
+            "DisplayValue": "计划"
+          },
+          {
+            "Value": "实际",
+            "DisplayValue": "实际"
+          }
+        ]
+      }
+    },
+    "1,40": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
           {
             "$type": "Forguncy.Model.ExportListViewToExcelCommand, ServerDesignerCommon",
-            "ListViewName": "表格1",
-            "NewOtherName": ""
+            "ExportExcelListviewNameMode": 1,
+            "ListViewName": "工时记录导出",
+            "NewOtherName": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=TEXT(人员工时统计!开始日期,\"yyyymmdd\")&\"-\"&TEXT(人员工时统计!结束日期,\"yyyymmdd\")&\"工时信息导出\""
+            }
           }
         ],
         "Text": "导出原始数据",
@@ -405,14 +419,14 @@
       "CellType": {
         "$type": "Forguncy.PivotTableCellType, ServerDesignerCommon",
         "PivotTableSetting": {
-          "SelectedListViewName": "表格1",
+          "SelectedListViewName": "工时记录导出",
           "Rows": [
             {
               "DatabaseColumnName": "执行人",
               "DisplayName": "执行人",
               "ColumnCell": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!J19"
+                "SerializeProperty": "=人员工时统计!L19"
               },
               "BackgroundValue": {}
             },
@@ -421,14 +435,14 @@
               "DisplayName": "工时日期",
               "ColumnCell": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!F19"
+                "SerializeProperty": "=人员工时统计!H19"
               },
               "Format": "[$-409]yyyy/m/d",
               "BackgroundValue": {
                 "DatabaseColumnName": "工时日期",
                 "ColumnCell": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=人员工时统计!F19"
+                  "SerializeProperty": "=人员工时统计!H19"
                 }
               }
             },
@@ -449,6 +463,14 @@
                 "SerializeProperty": "=人员工时统计!D19"
               },
               "BackgroundValue": {}
+            },
+            {
+              "DatabaseColumnName": "执行内容",
+              "DisplayName": "执行内容",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!F19"
+              }
             }
           ],
           "Cols": [
@@ -457,7 +479,7 @@
               "DisplayName": "工时类型",
               "ColumnCell": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!H19"
+                "SerializeProperty": "=人员工时统计!J19"
               },
               "BackgroundValue": {}
             }
@@ -468,7 +490,7 @@
               "DisplayName": "工时",
               "ColumnCell": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=人员工时统计!L19"
+                "SerializeProperty": "=人员工时统计!N19"
               },
               "Aggregator": 0,
               "TotalAggregator": 0,
@@ -491,32 +513,39 @@
               }
             },
             {
-              "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": "工时",
+              "ColumnCell": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=人员工时统计!N19"
+              }
             }
           ],
           "CollapseRowHeaderIndex": 0,
@@ -538,21 +567,22 @@
     },
     "17,1": {
       "ListViewInfo": {
-        "Name": "表格1",
+        "Name": "工时记录导出",
         "TableName": "任务工时表",
         "RowIndex": 17,
         "ColumnIndex": 1,
         "RowCount": 4,
-        "ColumnCount": 38,
+        "ColumnCount": 43,
         "SqlCondition": {
           "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
           "SubConditions": [
             {
-              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+              "CompareType": 8,
               "ColumnBindingInfo": {
                 "TableName": "任务工时表",
                 "ColumnName": "执行人",
-                "GUID": "8a030d7b-21fd-48a5-92e9-c7a3159e2395"
+                "GUID": "0faaac25-df75-4a63-a753-39713130b978"
               },
               "Value": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -565,7 +595,7 @@
               "ColumnBindingInfo": {
                 "TableName": "任务工时表",
                 "ColumnName": "工时日期",
-                "GUID": "6332ba1b-70bc-4fe1-b800-4a4e3ddfe23a"
+                "GUID": "d2a145e1-3348-4d39-90b8-02f870512590"
               },
               "Value": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -578,12 +608,24 @@
               "ColumnBindingInfo": {
                 "TableName": "任务工时表",
                 "ColumnName": "工时日期",
-                "GUID": "d55aecfd-2c1e-4942-a818-997371d4c9cf"
+                "GUID": "c761d3a8-bb5b-49ad-b0de-8c8b565d352e"
               },
               "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"
+              }
             }
           ]
         },
@@ -622,6 +664,14 @@
       }
     },
     "18,5": {
+      "NameUsedInJavaScript": "执行内容",
+      "BindingInfo": {
+        "TableName": "任务工时表",
+        "ColumnName": "执行内容",
+        "GUID": "518d2cf0-a2e5-435a-9ec6-5fae4b3c3c57"
+      }
+    },
+    "18,7": {
       "NameUsedInJavaScript": "工时日期",
       "BindingInfo": {
         "TableName": "任务工时表",
@@ -629,7 +679,7 @@
         "GUID": "a3f2ccc5-af3a-4a07-954f-4473e507f377"
       }
     },
-    "18,7": {
+    "18,9": {
       "NameUsedInJavaScript": "工时类型",
       "BindingInfo": {
         "TableName": "任务工时表",
@@ -637,7 +687,7 @@
         "GUID": "c1d027dc-2a55-4af5-a4fb-66924ea0956d"
       }
     },
-    "18,9": {
+    "18,11": {
       "NameUsedInJavaScript": "执行人",
       "BindingInfo": {
         "TableName": "任务工时表",
@@ -649,7 +699,7 @@
         }
       }
     },
-    "18,11": {
+    "18,13": {
       "NameUsedInJavaScript": "工时",
       "BindingInfo": {
         "TableName": "任务工时表",
@@ -698,15 +748,25 @@
       "1,26": 0,
       "1,27": 0,
       "1,28": 0,
+      "1,30": 1,
+      "1,31": 0,
       "3,1": 2,
+      "17,7": 0,
+      "17,8": 0,
       "17,9": 0,
       "17,10": 0,
       "17,11": 0,
       "17,12": 0,
+      "17,13": 0,
+      "17,14": 0,
+      "18,7": 0,
+      "18,8": 0,
       "18,9": 0,
       "18,10": 0,
       "18,11": 0,
-      "18,12": 0
+      "18,12": 0,
+      "18,13": 0,
+      "18,14": 0
     },
     "SheetStyle": {
       "FontFamily": 0,
@@ -714,27 +774,31 @@
     }
   },
   "Spans": [
-    "3,1,13,38",
+    "3,1,13,43",
     "18,1,1,2",
     "18,3,1,2",
-    "18,5,1,2",
-    "18,7,1,2",
     "1,1,1,2",
     "1,13,1,2",
     "1,15,1,14",
     "1,3,1,9",
-    "19,1,2,38",
+    "19,1,2,43",
     "21,1,1,3",
     "21,4,1,3",
+    "1,40,1,4",
+    "18,7,1,2",
     "18,9,1,2",
     "18,11,1,2",
-    "1,35,1,4",
+    "18,13,1,2",
+    "18,5,1,2",
+    "1,30,1,2",
     "17,1,1,2",
     "17,3,1,2",
     "17,5,1,2",
     "17,7,1,2",
     "17,9,1,2",
-    "17,11,1,2"
+    "17,11,1,2",
+    "17,13,1,2",
+    "1,32,1,6"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -754,7 +818,7 @@
     },
     "RowBreakLines": [],
     "RepeatRangeSettings": [],
-    "RelatedDataTableName": "人员工时统计视图"
+    "RelatedDataTableName": "任务工时表"
   },
   "PrintInfo": {
     "PaperSize": {},
@@ -774,4 +838,4 @@
       "Formula": "人员工时统计!$E$22"
     }
   ]
-}//WqWVAJrtVcneowuz/MFCx1c4XLaXdBK8b4qKZJ3yq9hdYg516/N3pxdz6LCvdwn7qlJdkyyG065qp0WgSuYbOHXEaMSFkmnd4sog5GBNgch7Uh3KZf5qK735ugRpfVgOIn8+3fcCK+XEHzTzyWWKeEeGMKj4WMibJQGfgotb4nYgq4GNft9fDUQd+dmMhQHnnlOQA/py1VW1XCeInmOZjHoN19kFsC2DU/ZXODisitbTN/du90RGW6rx2bEv4H4db06gS8lPNci/4fnpePcwmFxIaVFPhdMH8THiE8M6bI+rw7sHRPzTBAxaVRMEfkwlqihgmRguZJXtyIxVnKyXMVLwKy+H1rgwBhunYSBSke8BrZBW1uVfT9IUAnntZWVu9cYtfEVvjjkO5Wd7Nx4e9TfHI2+wBKfSzP5rg81TIMcb5WCbEOp1CsDOcjGZpunFftHubRr2t6Eds/5WSmzwcHNOCiO3frbU1BrrXPatRB0XvYeu2e16y9EcYdD+EY1tXzAC41LYnBjNZxuqZ9d0tGiXdC/DM5UV6SiHCCgcporc4/AA6pZjxqrJIggiaRWllB0fGvJqzgfgkOgmWkkp7diIwsYjO065qGdM9Zp3JLSFy1u8LmHzwQpNJY1IGqcIKscdHgw3p0OtUruRyNHR27hjooa/j8Nq1RKuZRugKmP50OGP+BtkXUwF2mAYRfPdcM30Oi4nxgGeJQJPav/P49oUwaJEnxnWA3KWsNMkR+eUaN7yzVFsYwC6XjmUSYjDimxSQ7Wz3skx9SgD3P7VfmldxxxgeRmwXKYEiQPbW/rKqbXJXk2DT7MqT2XIvwdbk/Flk1mYzE+SrTPBxUUtQgyh6Cd6eKtqcVXuhkf7am/WZTe+Okbn1HsFzs+zwdFux3EsKBbxkakd0pLs7cTZcg==|920
\ No newline at end of file
+}//Bck8tkz6GHDqoEr1edT3jgabtzYDQ/LxzR+vFzpeeykXnak2960yNB6qhO0gLAEjCG3pAgbCz/5pdSShmBs6BHe9W749a1cuNpztpYZ4v9RNgxrfX2SMwkhXlvk9RuDykKrVJ3KuGHyoOT0kjcpTLHxVV0K5YhdCoyGgKYiSDYZhVC+wdnUCTxgA9bmo/DPtrf0RnvV/GY7WzxvU4J0Ox0dTB9N7zIjMH0MXTWAMA9hE1rfwRuNpWeYHJVCGvCIkoOZ+gMCELxfUOXtfSzjF62yF3gLLBTSJbJzX9p2y88/8TzgoD8rw896Q0gVubb8YthsCpypF+4OvzxWMzqX05XRjss+PtJfwa8wdNU7t5WJz7dGC287nLDIXjcoD/Q30E9v1vk+j2lUH7H07wlQGwFpxmQnV5JKla/Y3jpaxhy8vMlgODuDP6Z4CkPMtfPM7ia4Utr2FNHsIXyvGYnMhLTQtMZtd8J0x3QRUViQb9mBo7ymmMjOxhR5xuln3BHMCQ2c86+KEmIGQk9TonfCC8gItuTEX4Lm4ssAShxxOCiPkgTrYMiVrlXEyVlHNCpldSUAiI9sgA1+5vLCh47d2MyGAOA+W22JPmzEDXf+pHiuKaK7/lkh+ml3l4irNKG3XCv2KIBWGDFhrQt/zrd+a0m/PWgXBGKKbZhhrULN/lqFN2Sla5QEhesF+ayIn5KeL/xxuwq+Vx8kFuG4V1dxC6kbzgEVhceNUgHitqtCksCPlNlhXC5WvwV0TWvcV54Fd29xb9v4LOYeeeNdUOG1bZ+l2ed35mEvZK+SuF+d1b6zEl6KXf90K/1JoJzQVKUutHZqZ9ewey3JHv2udNgGX+aLJyH+oXkVSmMXz1LCfUxm8hpsVUButKnC6bPniEU8R4EN0EWfh8f2T2BZc8c0wzg==|920
\ No newline at end of file
diff --git a/Pages/工时/人员工时统计.rd b/Pages/工时/人员工时统计.rd
index d4eaf85b..b1289ecf 100644
--- a/Pages/工时/人员工时统计.rd
+++ b/Pages/工时/人员工时统计.rd
@@ -1,6 +1,6 @@
 {
   "PageType": 0,
-  "ColumnCount": 40,
+  "ColumnCount": 45,
   "RowCount": 22,
   "CustomNames": [
     {
diff --git a/Pages/收益/审批结算申请单.json b/Pages/收益/审批结算申请单.json
index 3ac9e58d..f485b414 100644
--- a/Pages/收益/审批结算申请单.json
+++ b/Pages/收益/审批结算申请单.json
@@ -247,7 +247,7 @@
                     "MethodName": "Refresh"
                   }
                 ],
-                "ID": "083adb67-2b7d-4a68-81c8-02df7b209ce2"
+                "ID": "c24afd7a-06bc-47a9-bf35-7e941cbe9310"
               },
               {
                 "CommandList": [
@@ -255,7 +255,7 @@
                     "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
                   }
                 ],
-                "ID": "f6295514-0d81-4fda-9536-5560c178947a"
+                "ID": "c6a809df-e73a-4ae7-9e25-ada313c76579"
               }
             ]
           }
@@ -370,7 +370,7 @@
                             "ReloadData": true
                           }
                         ],
-                        "ID": "9a3742e3-8d3d-47f4-84b3-740cad11dbfb"
+                        "ID": "e313d36a-18ed-4be3-9682-79ae79f351d6"
                       },
                       {
                         "CommandList": [
@@ -383,12 +383,12 @@
                             }
                           }
                         ],
-                        "ID": "41b51662-062c-4fa2-afc1-121334d8c3c8"
+                        "ID": "3fb794a7-ba68-451b-a31a-e72c5e110d4d"
                       }
                     ]
                   }
                 ],
-                "ID": "3611fa06-fa47-4ebf-b698-bab88105ce8c"
+                "ID": "ed04a467-52ab-4dd2-aaa1-ac3ec126233e"
               },
               {
                 "CommandList": [
@@ -398,7 +398,7 @@
                     "Message": "请先终止请款单流程"
                   }
                 ],
-                "ID": "243c2a42-54ce-41a5-8ff3-5d004292cd85"
+                "ID": "951e8239-22e2-4823-820e-43278561faff"
               }
             ]
           }
@@ -1224,7 +1224,8 @@
                           "GUID": "40757848-15c0-4d75-943d-190f5232b23f"
                         }
                       },
-                      "value": "%Null%"
+                      "value": "%Null%",
+                      "compareType": 1
                     },
                     {
                       "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
@@ -1287,7 +1288,7 @@
                     }
                   }
                 ],
-                "ID": "271421f7-682d-49d4-b491-dc315e7a4af8"
+                "ID": "eead7797-4937-41ee-aea3-40861ac13697"
               }
             ]
           }
@@ -1650,4 +1651,4 @@
       "Formula": "审批结算申请单!$F$18"
     }
   ]
-}//EvtfhKPBHa4UMGQGRMzY76WO7YUO3m2VuYtxubUaAyPvWv1A6zvngOzrRKD6vyL+xRtPHxAl4yFLxmAiwPYqqrEzkIeDzT/2x4ca+k7otJvqEmTkHqY6i9BN0C5uyb/4dYCiH0Ehkx4kkbuuPYQiiJUEpjdUfyWqoWMcs7aKTn/uJdSJEI3CE3Sv+JZDBGB1x3eWvSaOZHT+GfOg9z64gHqebESFRCOz+GEypjTuH8beVu9kcDqAxdgOl6hBBx+ieHxN9z/qqd+QYEgKN1MchXC7uv1u4YMAsiytm4eIwtcCx4vm/iUgu83+9sWYzaEyLTGoLKJ9wvuV34YqKCVxSpEEFBQkUzIww5jSfjHmhyhBWYSw7puUHiVpSz/GuZyqDWxzZd6PVkHcKj3pbZ/vd4bYeQQ01rF//iz/+TICx4XySHLF8pJYD40SUTdxUOEYbiMbGG75bt2h+u7tOgYm/2jcpUDuBMwAVlXYbTLhtTuRkkgVqK0NkDC/+vcCqU5ReGJa9iE7JTMSGq4gNaRRoqu/Hvj87CNz0rYoA4B2RPo3c7+7uHqaeh36mo5EkvnJnn6xk8BHzUyKc6vSSNcvCqUX1NiuPOotb9uy8iWrPPyKz3m5jBcGpdzjaGC9FVnB/7VY1SM94DH5fmfjRh7NOSM3EQUMu0PHc8d2cCrr09dg7RRFRCRhjHgE0ri2oOtoTRE29D6T1OGgPc9t/eXENfQuKzBuLDrivafTWKBAMelpOIJwHyBSRJmVSECypsnm+Vbr62jyidxZd6teKhW6qnT2fzuu1YES582UqeVNviCXOSFBarmXIlVuTTzbER5/cRuO6/eZUsQdPHbro3Vpe3OcpOrtLKMWVSXaUx2SlCxncJR/KvfEto6KpHNdlUF3y9lsLUJSbKnHYygPjh/DPw==|920
\ No newline at end of file
+}//TtVjXc377X+/Kmeq3qBVZf5EhUyIJ/cX3hl3QtLIv6PJI/hrA47TKbpXjsqY40rWcwtsgjMv1lwcfh4ZrJEfXMCGrypM70OhOCFIra9QJ/ovNfrochtFVNz5VnDKhhq3RIjNWH+p39KBMec6rnTIR56ahLTVS0amNn3gvHTFPoajSQN0BGjj7t334bq45sRjLRuge6eBSNQIFliiU8fjvU0h5BXOQCiqSOrYSMNr29BnfxBgppD8O2NcOsvfr/ND21nqzRf2bI5E6BF4Hry4TsVSV3BVRxO0NKGoWMUS/R1PaUKLR5a5+b19UibVfX3HCJjRW3tOmRFsnNtERRZitMGeREskDIH+JGxaeHj8Bt7ee7LMY/x+DR6o2cxaLyCrCJfnKpzdeMqvuZZGNN/jr6VCXV2zarmBUW0HW3D4KvhlkBnQH1/mShTt4HugjiLSFO0kdyJnF9ja8ldbTKxqPnjdZ8MuoZHWeycLWhDugGXyTGWV55PH9dRLX0uH77C5JobWzdtmzO9cl444cTmZPP2LM60DoA26uZeFEY0juprE+/kb6GmtGuzUI6FRVjJSeb/3PZk7mmDEspdy9Cv/+sx2oJR833FLAqIhzdK4zpt1RYkbM93oaQXqWSrL0rcHbrAyW+dpH4vQBNV95hmIyOZsfVZlDRtqqqWEh868g/V9kv4IdYVmjPGGcuXaegc7ci8+0DH6qvoXbGsNKIlsUehd6zKbSQVpgOWJ4ZVgjiL8ppsoP5rOOCBrQwudKN1cmdbtjaz74iZvEMF8wC1bQjZg6HOjGszFqBntSzWiVuCA6r0odpWUVJ5ev4P6kA2rTgpW79PZo+LE5iMBikazMDSHlVnsl/w3bqaE68pwjPzny0JS8zxcDsMBhZZlhWsdDGmYsWak3loRSFU8eeaCGA==|920
\ No newline at end of file
diff --git a/ServerCommands/汇报/根据汇报模板生成内容.json b/ServerCommands/汇报/根据汇报模板生成内容.json
index 6cb3070d..b57c49c5 100644
--- a/ServerCommands/汇报/根据汇报模板生成内容.json
+++ b/ServerCommands/汇报/根据汇报模板生成内容.json
@@ -524,7 +524,7 @@
                             ]
                           }
                         ],
-                        "ID": "a35f0360-e6a5-4521-ac04-ad524f8988f5"
+                        "ID": "a65b10d3-963f-42ba-a1d1-d143217cf282"
                       },
                       {
                         "CommandList": [
@@ -545,12 +545,12 @@
                             ]
                           }
                         ],
-                        "ID": "207b3341-fdd2-4784-94b3-1d0aadf2b892"
+                        "ID": "06cb83e3-b6f5-4db5-b5a5-0bbf5826194a"
                       }
                     ]
                   }
                 ],
-                "ID": "55d0bcf9-f58f-4969-8af0-081b70fac6b3"
+                "ID": "c8d56b14-ef28-4e1a-bb85-c175d18ebb9e"
               },
               {
                 "CommandList": [
@@ -574,7 +574,7 @@
                     ]
                   }
                 ],
-                "ID": "dd4ba34b-f515-4523-902b-884e5b21c9d1"
+                "ID": "18edc31a-b9aa-480b-818d-040ed89306bc"
               }
             ]
           }
diff --git a/ServerCommands/汇报/自动生成昨日日报.json b/ServerCommands/汇报/自动生成昨日日报.json
index b27fff0b..721d913c 100644
--- a/ServerCommands/汇报/自动生成昨日日报.json
+++ b/ServerCommands/汇报/自动生成昨日日报.json
@@ -368,7 +368,7 @@
                                         ]
                                       }
                                     ],
-                                    "ID": "fe507f10-4aa8-4539-a6e6-a6daa1f49902"
+                                    "ID": "b34c65e6-807e-4f27-88d9-2f4f311da074"
                                   },
                                   {
                                     "CommandList": [
@@ -438,17 +438,17 @@
                                         "Disabled": true
                                       }
                                     ],
-                                    "ID": "ca2093a9-a41f-43c0-8f6e-f9ceff250baa"
+                                    "ID": "451852e4-2722-45e3-a3be-784e732eb4b3"
                                   }
                                 ]
                               }
                             ],
-                            "ID": "08731c3e-fd96-44a8-9872-71bcfdb05a9c"
+                            "ID": "db985719-024d-43df-a373-7bb3a7d26fcc"
                           }
                         ]
                       }
                     ],
-                    "ID": "a75a6d47-bd9e-4e33-96a3-fdf3d79d20a6"
+                    "ID": "2d3b03d4-71e6-4ef1-9d90-23c155296557"
                   }
                 ]
               }
diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3
index 1ad771f7..a43888c4 100644
Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ