{"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"}

.collaboration

@@ -132,16 +132,7 @@
   },
   {
     "ModuleName": "TableView/View_任务工时统计",
-    "State": 1,
+    "ModuleType": 23
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-05T01:36:09.4604203+08:00",
-    "ModuleType": 23,
-    "ToRemoveFiles": [
-      "Tables\\工时\\View_任务工时统计.json"
-    ]
   },
   {
     "ModuleName": "TableView/人员工时统计视图",
@@ -686,17 +677,7 @@
   },
   {
     "ModuleName": "PCPage/新增报工",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-05T01:40:44.7305604+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\工时\\新增报工.json",
-      "Pages\\任务\\工时\\新增报工.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/分配计划工时",
@@ -784,17 +765,7 @@
   },
   {
     "ModuleName": "PCPage/任务工时统计",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-05T01:34:03.4255703+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\工时\\任务工时统计.json",
-      "Pages\\工时\\任务工时统计.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/人员工时统计",
@@ -846,17 +817,7 @@
   },
   {
     "ModuleName": "PCPage/收益中心-收益明细",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-05T01:38:19.5913668+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\收益\\收益中心-收益明细.json",
-      "Pages\\收益\\收益中心-收益明细.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/提交结算申请单",
@@ -952,16 +913,7 @@
   },
   {
     "ModuleName": "ServerCommand/上报实际工时",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-05T01:34:48.8043489+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\工时\\上报实际工时.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/分配任务工时",
@@ -1437,17 +1389,7 @@
   },
   {
     "ModuleName": "PCPage/项目分组详情",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-05T01:28:53.3666291+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目分组详情.json",
-      "Pages\\项目\\项目分组详情.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务版本详情",

Pages/任务/工时/新增报工.json

@@ -432,6 +432,7 @@
           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
           "SerializeProperty": "=新增报工!B12<=新增报工!O27*24"
         },
+        "IgnoreBlank": false,
         "ShowInputMessageWhenCellIsSelected": false,
         "ErrorMessage": "工时数超过所选日期范围允许的最大小时数",
         "ErrorTo": 1,
@@ -574,7 +575,7 @@
                       },
                       "NullFormulaValueQueryPolicy": 0
                     },
-                    "ID": "a3a049d5d46e472492dd0d7b2f73c243"
+                    "ID": "1fee086e22d54938be48cbeb9e4d82d7"
                   },
                   {
                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -765,7 +766,7 @@
                                                           "ReloadData": true
                                                         }
                                                       ],
-                                                      "ID": "0e1c2f19-c270-44a9-8ed9-d082007a2c3b"
+                                                      "ID": "035a23c7-ff9a-4e8b-9ca3-038a80161b83"
                                                     },
                                                     {
                                                       "CommandList": [
@@ -780,12 +781,12 @@
                                                           "BtnText": "知道了"
                                                         }
                                                       ],
-                                                      "ID": "7db11ce5-0dd7-4f3d-88ee-2c3da93845e7"
+                                                      "ID": "d822d452-20e4-497e-9552-4ae92ce62bd4"
                                                     }
                                                   ]
                                                 }
                                               ],
-                                              "ID": "9602cc31-1749-45ef-8ec8-54b7ffb1d4f7"
+                                              "ID": "7420f0b9-82e4-4904-9f1a-769886e2381f"
                                             },
                                             {
                                               "CommandList": [
@@ -795,7 +796,7 @@
                                                   "Message": "用户已取消"
                                                 }
                                               ],
-                                              "ID": "72c55c32-f690-4815-8394-5062d0d3ae76"
+                                              "ID": "f9252f1c-0fdf-409b-873a-3dc9647c13cb"
                                             }
                                           ]
                                         }
@@ -838,15 +839,127 @@
                                     "LoadBindingDataOption": 2
                                   }
                                 ],
-                                "ID": "cb69075a-2c98-41f3-bec4-2d4eecc415d9"
+                                "ID": "ae80c0c6-b298-44bc-be8f-2d911b6238e5"
                               }
                             ]
                           }
                         ],
-                        "ID": "d016930e-c9b7-4ead-901f-6ca59162701f"
+                        "ID": "f09e7f7d-4a27-44bf-83d3-12c08b84cc07"
                       },
                       {
                         "CommandList": [
+                          {
+                            "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                            "ParameterName": "工时统计",
+                            "TableValue": {
+                              "TableName": "任务工时表",
+                              "TableValueType": 1,
+                              "BindingInfos": [
+                                {
+                                  "BindingInfo": {
+                                    "TableName": "任务工时表",
+                                    "ColumnName": "总工时",
+                                    "GUID": "a588183a-77df-43d1-950e-db860d827535"
+                                  },
+                                  "ColumnName": "总计划工时"
+                                }
+                              ],
+                              "SqlCondition": {
+                                "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                                "SubConditions": [
+                                  {
+                                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                    "ColumnBindingInfo": {
+                                      "TableName": "任务工时表",
+                                      "ColumnName": "任务ID",
+                                      "GUID": "1f64f9e1-f263-43e5-a608-15285de31f3f"
+                                    },
+                                    "Value": {
+                                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                      "SerializeProperty": "=新增报工!任务ID"
+                                    }
+                                  },
+                                  {
+                                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                    "ColumnBindingInfo": {
+                                      "TableName": "任务工时表",
+                                      "ColumnName": "执行人",
+                                      "GUID": "aa094289-a6e3-4e40-be9f-181c0a37c17d"
+                                    },
+                                    "Value": {
+                                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                      "SerializeProperty": "=新增报工!B4"
+                                    }
+                                  },
+                                  {
+                                    "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                                    "ColumnBindingInfo": {
+                                      "TableName": "任务工时表",
+                                      "ColumnName": "工时类型",
+                                      "GUID": "c9d8a9f8-7aa1-48c8-8214-d77c579013cc"
+                                    },
+                                    "Value": "计划"
+                                  }
+                                ]
+                              },
+                              "NullFormulaValueQueryPolicy": 0
+                            },
+                            "ID": "b0be88b9b0d049e7ae3cd94d4561f3ec"
+                          },
+                          {
+                            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+                            "ConditionAndCommandPairList": [
+                              {
+                                "Condition": {
+                                  "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+                                  "SubConditions": [
+                                    {
+                                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                      "param": {
+                                        "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                                        "tableData": {
+                                          "TableName": "任务表",
+                                          "ColumnName": "项目ID",
+                                          "GUID": "0741d3db-bd5d-45f1-849f-d889c4c08e78",
+                                          "RelationBinding": {
+                                            "RelatedTable": "项目表",
+                                            "RelatedColumn": "ID",
+                                            "DisplayColumn": "工时分配方式"
+                                          }
+                                        }
+                                      },
+                                      "value": "1"
+                                    },
+                                    {
+                                      "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                                      "param": {
+                                        "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                                        "cellLocations": [
+                                          {
+                                            "SerializeProperty": "=新增报工!工时统计.总计划工时"
+                                          }
+                                        ]
+                                      },
+                                      "value": "0"
+                                    }
+                                  ]
+                                },
+                                "CommandList": [
+                                  {
+                                    "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy",
+                                    "FunctionName": "warning",
+                                    "Title": "温馨提示",
+                                    "Message": "当前成员无计划工时，请添加后重新操作！",
+                                    "BtnText": "知道了"
+                                  },
+                                  {
+                                    "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
+                                  }
+                                ],
+                                "ID": "82773e11-25d0-4575-ae4a-2d8b67b8b44e"
+                              }
+                            ]
+                          },
                           {
                             "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
                             "Title": "加载中",
@@ -973,7 +1086,7 @@
                                     "ReloadData": true
                                   }
                                 ],
-                                "ID": "dd329d50-7ea5-41c9-bec3-98fca6fc6403"
+                                "ID": "8fe8805a-dee4-4b4c-88e4-9c36ed36043d"
                               },
                               {
                                 "CommandList": [
@@ -988,17 +1101,17 @@
                                     "BtnText": "知道了"
                                   }
                                 ],
-                                "ID": "5944ca6d-686e-475d-986d-1d46115a0100"
+                                "ID": "d24901cd-753d-418b-93c5-cd74e75d7b27"
                               }
                             ]
                           }
                         ],
-                        "ID": "a91e4008-c2a7-454e-aee1-5302a49edd33"
+                        "ID": "4b752455-e103-4669-9c73-349718002062"
                       }
                     ]
                   }
                 ],
-                "ID": "6d475b79-0ba3-4a20-a4de-321e187f846c"
+                "ID": "51edf461-9921-46ce-b7bb-9e2c14daa734"
               },
               {
                 "CommandList": [
@@ -1008,7 +1121,7 @@
                     "Message": "请添加参与人后进行操作"
                   }
                 ],
-                "ID": "fd0eefc5-fb25-401d-b925-6a94e29a297c"
+                "ID": "8ef432bb-1d33-4213-a2f4-774db9cb5bc3"
               }
             ]
           }
@@ -1473,7 +1586,7 @@
                 ]
               }
             ],
-            "ID": "1c7745cc-31e6-484d-bd00-fc2dc88da497"
+            "ID": "ea75e4f3-4875-415b-9fd0-e351942282ee"
           },
           {
             "CommandList": [
@@ -1490,7 +1603,7 @@
                 ]
               }
             ],
-            "ID": "4376f577-73af-464e-9e8e-162937f91315"
+            "ID": "35cb1cbc-39d8-4457-a429-6e3f2e6e8ba9"
           }
         ]
       }
@@ -1518,13 +1631,13 @@
     "Margin": {}
   },
   "CustomNames": [
-    {
-      "Name": "任务ID",
-      "Formula": "新增报工!$B$27"
-    },
     {
       "Name": "工时类型",
       "Formula": "新增报工!$L$4"
+    },
+    {
+      "Name": "任务ID",
+      "Formula": "新增报工!$B$27"
     }
   ]
-}//wDiauKYgggUBevkTkMoRLrf6dSfHGaTCgXaCYwywrD5AVV50hXI8Py5Byay2I6WFcr4XFQt019Qc4hYFLfajj3ejl00ts5d0AuFaKYYKQz8bmw55dVQvi7KdnrSPXMVY2zrUUdD+FahWmqwtDO64jZwW9AIkMYmDzo7JSIi+MUxR58/r8Eb+p37R+wFIgX+SzTJMXCtK/nOEB+nBQnmnSgDM3YwUCBETL5awfKyrn8O7MhxG2fZKs32DEv4TrH5K/81q0971nBs+QVABBnJAxQLs+vkIglzhQmn/kiKFFa/qYIDZrPigZoLJhQtn3Jiw8wyv8qQd6dbA4dBWKdiIfosu/mc8Jn7P6yLmifezO8ro2tA6RCfobvmfJui+1fisQXJcqoaILhQ00isp/z69SxlDzM88GevnKNtwIlErD6xL7UjDNnjHqhAmoh08COcmaJnDRM0cS96KQ5siedZjmZAoNvH/DZE8TwgT4h10s+g4fy8QEJbQutFgNq8IJz7Sg46WMMYqtQYfj5scxHh0T8glA5yICvKCwh5Gj6jgDy3F+1tM4KEo3g+7Un7z4lEdmpmIeCQUU34P1Ja+c3CisfK+muz08Quu4HDsi7cmGNKEElqe/j+uLpToJdJhZBALeZOTgqYv7/LXHNIHLdHTjWAnSFja4UtFGKP5830GVI0Banu4KMZll+1IuDxe0xWDIVw1SZ7rE+3AbfCTqCGiYms3unlDsn6hdpaZlcKVt8Tf9t17rTyRrNjOTKwxF/ZiVKesZmFvbkizm5vJ1I8Js1tVEUSKBjwPvMKHJ6FHv1ocAVXgegZFL2apWQZ2DXRIcuGacbcCoxg+G5BhLYqW0RDDSg802pFyjRzd/5kNRsQGXtzpj0w7LUfp41l7/XoHTqU87tr7BX8TGJ+wnB6SsQ==|920
+}//fcAjTKURbpYntWMaY1feaq+HLcw5oL/rk1rpQaj0DkSnKkrVonvjsXkWYBWf/yJIve2N4XbuxCjTWiK8HhdXEnzJDfhMUwcGQNHv+67BzxlYgXALJndQtFoeM57vnL5Yp9TG/HZoG0Bs3N2rHdx8ZDbmIwmDHuAaRavT5N9WdAGq1faLZ9dSrO2f6B1JJC2DUvNpPhXAV6j4hUuefk/mzglFfAB7ba6o9E2SLbI5N6hAQcI/Mx87aL5FmhAuYHyNH33+wKaN52Y1pxoxVaoLPOorgI8RxqZ9KgqsayhUVy+F6kNQIR+xpW2gRNHhorS09xp4Y2pr7x3F8f6hmnxIozDB8zkbWHE7JFptLOr5igHssxE0K6s8i6FmXTLpSm7FzQygPfRwD6xScBh8h5doFFvCXgfgoOoi5RPWPclkOI+VXKdrgj3UV0DARCP0pw4+ZbBAr5YmgirhWCXE354B3VQJ/xLYkwHC6N2+sphRFNw21H/fPK8Ib4AkCbsxqAn0W+0BuHrjYRfuDAGv8iRzLz6G/xjTBLeKkfo6GRZu7Q7dTSohLeI4/YtY9yw0pMxeFcD1gvAKa0iVkTrYsVfPlAHrX5GUk5x9uw02XZMGVMqYWcsx/BoNJIekC0Uj7fi0T27wD0MsXBYtWx+Jht9eYaAJTT3VbjG20SJk0PKzg3yoFWqlk9rGEp9IW2Ng/UPi03Yp+umvmNBdruNIMBV6afV9yoBbU9E4JHSz0hszzyNFJG5/AGjBQD1R+ugNnr78XSjxEooGSITTBmTOUd+RS9wwHcEASzGd/ZocgNLTgjhwmQejQxxabzivKSnHpL2zDJOGbnY2/1v25vq1rRsGn/OPSB/ZY8A1BuaGVlwyedKBw4vQT4HgsNmjfPBYDIDfHCLq7AA275J9r8KHhqXV9w==|920

Pages/任务/工时/新增报工.rd

@@ -7,13 +7,13 @@
     "26,14": "DATEDIF(G27,K27,\"d\")+1"
   },
   "CustomNames": [
-    {
-      "Name": "任务ID",
-      "Formula": "新增报工!$B$27"
-    },
     {
       "Name": "工时类型",
       "Formula": "新增报工!$L$4"
+    },
+    {
+      "Name": "任务ID",
+      "Formula": "新增报工!$B$27"
     }
   ]
 }

Pages/工时/任务工时统计.json

@@ -403,6 +403,9 @@
     "Count": 27,
     "DefaultSize": 49.0
   },
+  "Values": {
+    "1,19": "总剩余工时"
+  },
   "AttachInfos": {
     "1,1": {
       "ListViewInfo": {
@@ -516,7 +519,7 @@
       "BindingInfo": {
         "TableName": "View_任务工时统计",
         "ColumnName": "总剩余工时",
-        "GUID": "24ce709b-6740-4ea3-b3df-b17444bb3fb2"
+        "GUID": "2ed5fda8-1cdd-4d7f-acb7-77d0a9199613"
       }
     },
     "2,22": {
@@ -588,8 +591,6 @@
       "1,17": 2,
       "1,18": 2,
       "1,19": 1,
-      "1,20": 2,
-      "1,21": 2,
       "1,22": 0,
       "2,1": 3,
       "2,4": 3,
@@ -600,8 +601,6 @@
       "2,17": 2,
       "2,18": 2,
       "2,19": 5,
-      "2,20": 2,
-      "2,21": 2,
       "2,22": 6
     },
     "SheetStyle": {
@@ -614,7 +613,6 @@
     "2,7,1,3",
     "2,10,1,3",
     "2,16,1,3",
-    "2,19,1,3",
     "2,13,1,3",
     "2,22,1,4",
     "3,1,11,25",
@@ -624,8 +622,9 @@
     "1,10,1,3",
     "1,13,1,3",
     "1,16,1,3",
-    "1,19,1,3",
+    "1,22,1,4",
-    "1,22,1,4"
+    "2,19,1,3",
+    "1,19,1,3"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -644,10 +643,11 @@
       ]
     },
     "RowBreakLines": [],
-    "RepeatRangeSettings": []
+    "RepeatRangeSettings": [],
+    "RelatedDataTableName": "View_任务工时统计"
   },
   "PrintInfo": {
     "PaperSize": {},
     "Margin": {}
   }
-}//yJS78x3vzP5o6uUd2eL7RneD8NC3dGwYxVDsAm50JGTj4BkUtPen32g7jQry4PEyeVKxe2GLPijqCeHRO0fvscN6LeKtbG2Q5RCLDoLFwMSiGPrMDnd26+IPFrHx2LHThdCV6bAEgxzLm3NKfaFH/9ngMszXFbXl5xzcTFBMzdapu+BtiRcsLS0Lq9wdN55asfWqR1Y6crAQu8DR6EcTTnQCJ5Yf0tSNruF0BEhRwHkK+UnGuR6RtuFxQ98hqy8DLWiDBimPx6M/BLhRjN744zWjsWrV7hiiEFlOI9516yccL7qbzPQIU0WGjBeAQ9di9q0N+J2vPMhn98yFuVnAoWPP18SNxwyrtH3NhhxjHdIAIfo3Wzmfdh0/NGyBGVS6y9dXsBZGw/RktIKGml74zh1Z6J+2tebtxj7IMLTsve5Bd+XmPFwBvQgTp//6Dvroo/+rtwAaNDZ5NUQ8Btad0uQoq0IOba1pTQhvx4dWQAeYuhCyhudwjLq1/vQ5+bgi/2BUleq9+3ZKcKM6hRtymmhRBTWUt0rl6NafJ49x3RLtES0m3+/2jzj6MdidppVu+D4gUn3IdRuj2+BQErmp/zxGv/+1tMPlT5OKCGgeuw8LO+DXS+Vjowxng+tonwOmuqNcCQ0IWeJtmLBEjNYHVBUtoWcG250iHonXsKrXJ1yaiAzVJFX/gpV89dPZSmzQW4vyoI3qNLcI0XusIdLM2EEpc5+RKZrgE/zKOd9zFEgFm4IzWufaOE3cYtrlxtMrmy2GL0xVWMy1MA5SKZ8Qe4Ptr007Yck9nCOJJq7rIP9UkVcJzdpDJILFXdvMcsEnCTHLYAW4U+CGLWa4dNMub8NSwlfS8J/2FLxUG4H/Mbov5gJkvEcuaVatAcoBMmyEjUzxoZ7+x9h63uwzP7fM1g==|920
+}//5vnrAnFP2OQ5bueHxN8Wi6jK/xnu707Dg/yMDD2BVAF+kVquTqzPGQawqZ4YFx0q8/6V7QvnUdXKdZwsNcL3GVkj8eMxgpXw/fY2uoxhM6xZGGtQmX9aJcStA4XXjzlpl/O2zOJCdPrF/oryywx9FRP6KyVijtw51PvKygC83fX/hXeVyHe+IHmsdcvO8nzCqQfSYn0juHe2rjbJrCMn9wJc8y5abSYem+EeFVQqDmodD5AHboyHekYGrcvHagnvC7mixksA2R2NS3TJVICpmM9mHIvO9Dp9ZSvVIKH+s3uU8UwIoDrBQNTl6BKRhBN4d46yfp3jOlBKMVPfAFCN7ssMtfKtpsfnDVjAAr0o7MMlyoUVnV7VdijHAt2vY2z1MZ2DWlPRIB1DaTblTCkUjYesdl5dyxWNjFunO2gGXCaKrA8VzWtmYtL9bmAeCkxxW2VEKpz4LFOYw6J4cUeLLG/FIsDXdKoAQRs3+HOvGd4fgfwGr+1uP/0BEgEKSE/9vCs0AY7eNHaTy3fL+VUxscUL24PNYcU6nZLjJh/gm5acn1IQJeMqFoen83q9Xm2vFiPs/nEJbbZFJXM5DzvCRH6T3DymPeyy8USI60U4efywQ87IiM7t31lX5FhNgcEUCMMKW2K3VJH6s3zbCl9/r77UWMomHoGav26h2msfWMnwKjEsrVluIY+ywU3JHZ4Jw9cyJ0q9TSZbz4RU+UsuQ25Su7yzZHEuM3sKbkJ3GG7oqunvmXjgWDa5pwAXUMJotPPpxEhacU3GAubLiFyDPih1RMCKIx55C57Jw056NRkYhigoqKit/YbTAJrKvYpGh5Zj0n4ue1cdG0Y49zVcWABsk0mIvrPRvsMjFR39FTD3J0JcpaoHdyeJi2RpX6Y4woKcGfQrWjJ7wLcSBpzxBA==|920

Pages/收益/收益中心-收益明细.json

@@ -371,9 +371,9 @@
             "ColumnBindingInfo": {
               "TableName": "View_任务工时统计",
               "ColumnName": "执行人",
-              "GUID": "e64123d9-f3bd-4e30-a4a0-d446c92de234"
+              "GUID": "40be89a4-d662-4ece-b0af-e91cfebceb41"
             },
-            "Value": "%CurrentUser.UserName%"
+            "Value": "shamus"
           },
           "OrderBySqlCondition": {
             "OrderByColumns": [
@@ -840,4 +840,4 @@
       "Size": "3,18"
     }
   ]
-}//uciBmT3ENaWE+TdL0fQebu67Q748Em14+qTy/5sfuoKMoxcoHf7kA4M2P8dwR+zB2bf3nOV1gCPRRocO3FaUAz1HlShbgJzJsNVG1pyYTJCg0OjbRbKkFa4L1G5PPykJFk/wnVyzaz0EIuJQVn5X8iC5o7EICeSb6oY2LQVDAh7pwPWjsYNMU8j09OMbcH3kHbLB/sbrkziAz2snn3JkENeC0HmpWpyV1CPLvXAOAQ/MTj/EEHBiWvCGQ8rETkkb/jew4L2ZKqmqEuoWzW3SEZ5eUNKtK3sCxhjmWphMSn0Q7W/95a/SoQEsIW8eWh7f/TqmzQ2ykN6q/cuGPYTgard5x7QL6fIWIt7WSOsq/lO9FO1JG32BfH+hTxYqdtL8KXwxAPObPZWMRjvILlD5T+/cErSnygUktgJWvUaQGm0u+yxsvSLIsDHDvCeXkhu4cRAtvsJtMsodc1RDt8qTOr7P3chNrv1Q4ZBfwe0pRliuV6RoSuVFKN1In554TQMI2oa96uiR/N3RaIfz4DQnXb3npR019uni5eRKvSTv/3YY+BWhO1mwImVL+khnyryXcMUgbsGZTfFj1lD5sCCWynXJ128ZGTae73Lr0jAdentGOXC9Dnfr68Yje78xM3F8O3d9HYptqBCXwIOZyPu0S/ySj+l1kosE/ekQF4uTVVW+Uzv+24B6fYeA4PbRiQ0dOJbGroKe7au/PiFo4k83rpZGBz/v6GYzek3AifwWsyodxV/RHLAYtCmVDaMdDCEua2oIQNGVmJaRrBHFuTNy6PGpRkXVQdBRX23VOwHWu++5d6EnNMwbC2l8Zmldp0eB0VEurgpGL//kiK39iDj5VhCv50YuwMBbxkt2LxTNOkOHeEyMXfUMGar3zbOdI0/pf/7diFN9HrKsWFV0GsAHQA==|920
+}///FP7cQN5MbLF8zU8NYcBRCVDcpGiZO0jdDCzCLjmQCsXF3PO72oqQdZv1Qf1MHh8CnuzkL0ZQLj3b1ewZrEDKv6JF0BViZ5gplmu3uXUi6Ww+rq3OHgXusSCOmOM14ELm64TVpAw7F4NrBh9Nc27pWN4bW14Xaemgy4vyO/1MLp4v/AAvPhg/b0xjB4yiM3iTxf7eBegmzbMC9KSOkW0n3/SwppUpb/QYQlLx4Cn4MljvzWXAYm2LFRozXVVdM1LudXxmS3AgDiwngPUqRezn5SApsEJPefWgfoCGYmJw2PzvChuDxKUUn5D51Kz+Pxo4SdjnYvPQsdtYJV0RQwQ5mZ+BYez/d5+gIUERS4+bLX5fW29+3CHHFyjzumP4urkxWTLWMc7AaZQIT/6IWF3+VdCZNPeuSATXcuz78SweUbfVP5IZhmVRinQs00C6ri+QKpeKlnL8zrFeE0pqNKnhpacPVqlNyoAXmKT2rNguhDW06y+3rPN8DXGEgz1qf/Cr+2wzRuiyVF//TQTIOPWogmT5Jwl14bFp9lhyvImtpgeMLvnL1/mZzLq88InhuOZ64uupbfRyQmMvVpjeZdcB6ugiD8csQRqZss2AgTOafUGt9pR4u+16Fra7Oo6w9d4fb9yiL0+YP7rE+hg00/YJ6vpjDSPZi+K2/XqVkUYOku17v3yXCtPaMYSbrf7Ry+5+DpKg/eeDVRFdO5LIwhfeXQzPVt5ymp2V+KlUEFcGx3vdnnjDL6uJCjqBqGfrbiqP2WQXx/bpdCYaegxrU3ZH7ge4LOLmu5uH5XtYtB75Q5seCylEmhPZW2v1UUt5iQkhK9BVR8gDh2ulPippeMIAp8sMOpTrZLPIkRnWMGDa5jUjnvPTtai7C8BdwUPQvXxPhY74qqV5H+W8Gf723KPzA==|920

Pages/项目/项目分组详情.json

@@ -223,11 +223,5 @@
   "PrintInfo": {
     "PaperSize": {},
     "Margin": {}
-  },
+  }
-  "CustomNames": [
+}///OFJbl1Bs7pVSwNzJwg1fU6ebEhJK1wos39BXDUpv6J3RUKhplfbGwgQ2rAGCHDrjqVAhBbLtMlZyJHmSZ8/fEhWEvv5p+sJCZt4s9qN4/t2L4HgOwbapamGHbtnEuA8TZhZxfZiwo8SfAj64y+FBDvOmlf6ESuUCivkY1zyJ1Hr3fMw3ZSqLnZexQHVaWDlmHd8UwLBTZcpnw3et+o725nuByojUqu0IQPyQwTph5NrplmTUHF9lixFm9/nqAJam1lcppqVi8pUXkgAid4c1r2gSqCbAIxdgmNXsmezsFoM4bg3577jwG/f68PaBZAj/cx8SKLTiGfP7vILGc1oQni6bwnGUe62tKh/dCjqgYXfvnuADIUMNzYdrMzbLSwzGgLOsT0It6RCJdq6jBXrlZQ790mQIjZfY48enHJcdaD4wOga2lUUAdB2AYO7WtQIz/IaG4QQoTyMjdtJwYvOszXhHZZ31qHx/BIuP5TG+hoWZUVUQd6Xbg/MkPy52XkbR4fdGkx1QMo+0WC4Bx61N+k7Hq+FDWtGB/EI6TtqCS9cf6I1WZaEH4JLeCBEkEtHRpjxx3McpeA2MdBJzamSNn6CJNYWTSFDgCTpExVkBTAF++BZntDyVMccV4tAUkCBvkhmMd+UxzCIhFgkK8cUVf9inKya6/saEQ3TZhRkNt10WJK21bxgUxKAv8Jak+0PwOY5uM4XBAGAPyCCVDMzX26NHxz0Qg7hXMliDIIdmjbFQNMLFYQ2cfcsd7OAc1O62CaTn5+mgDrrqmOhG6FO3MoN2llT34pvRWL+Ty2339ZKmx5Rli4J9bDelAVD+w6sWAABVLS26OWmilACGQkoIpb7ZYJLTTWl9snvvJY8iwBcq5UiNzrOP2Dgs/Rszoh+vSVegCVN83m2bYc/puIZJQ==|920
-    {
-      "Name": "项目ID",
-      "Formula": "#REF!"
-    }
-  ]
-}//CfMuxy/85i1CPh54/l3HYHU61oBGTbNt7uTvk5k7ddahgNAAqBIzhVShhlVktKLFxEparyBnE6DCu9kVLkyuX3UcnP/3e2cN91cVw19Bd4h6A36RzJGX6ThkEzkv42+q7OOHYTlD9xkt1OcKDHWoq9DRBMnaLZVnlaIi7FJTZ/gbHGWSwPZTtWfMwLTxEQY/xyT1Pjek3NuQY1IPIeBiTBeT3jOvB/qXG/C2dt6MprGRit4UbM7dRNH7t9HWS+R4z5wqDNQJPnb74VdBR8BNsr/v14fnbSXI837fmsvDGBG1L5cQLU5ymAR0KzOagIOGAc1F7+Aryxp00YitL4zEsWoOChPiPETR5Hze4M/NVJtyBMK6g6tFvHww0m33bM2+rE+LBxIxnDSlgUf/9V0Eeh/Qu7Viqo21dwOfRYU3m2H7/fgZMO6V7x66ybWmxj55DdhhhZc+QfH5D6IDub+kgiC9sVwIw7YNXW+ej1IG8BUh288NpciQVkXplSfUEBYgoWfmWkze+oNZT/0OOo1IB+GpKIU6u1xmQfwexvOaOOOrTAIOpJT0a9XxJCV+g6YSvnt8jCFEBg+9RkkeH+yHR9EPwi3lgrca4azReRIpUSrF1WFqRqLWKpYInBszocvVzzneEex7drykbJ0ysjTD2yburdoCxejD1lbX5BcvSVjWlMck+jTHIi58bScfo2muuOLeomIldmgVDejgo3nOXoML0bQjBPgzRQUk+SdiYge0qaqOYmq7WNpZXmZMNehHqC/cHLbST7jmdfIprSVq/tCg1p9G8lzdBn0OgGJoOPI0gJZna6LFdO0kiIyv9ycHjN/vrkHFMbXakd3LUH8QJqMmD44egC7PrxUu2B3l9L02kCovWewP//3KQk2O+clhKaDZ9uKAdcFspe+g5DICmw==|920

Pages/项目/项目分组详情.rd

@@ -1,11 +1,5 @@
 {
   "PageType": 0,
   "ColumnCount": 11,
-  "RowCount": 6,
+  "RowCount": 6
-  "CustomNames": [
-    {
-      "Name": "项目ID",
-      "Formula": "#REF!"
-    }
-  ]
 }

ServerCommands/工时/上报实际工时.json

@@ -508,7 +508,7 @@
                                             "ID": "76e6b1beb86d4cffa86d99da1b1b8d56"
                                           }
                                         ],
-                                        "ID": "4fa65951-a296-4051-9a8b-32358ea17112"
+                                        "ID": "5892bb26-315d-4713-b965-a9c3a0c5aaf5"
                                       },
                                       {
                                         "Condition": {
@@ -540,7 +540,7 @@
                                             "ID": "14e4ee83f2994475987fffe9fb3f8315"
                                           }
                                         ],
-                                        "ID": "d0469d09-b007-490c-b22e-1dc9ed953d0d"
+                                        "ID": "560d1637-206c-428b-b348-0bc18e17414a"
                                       },
                                       {
                                         "Condition": {
@@ -589,7 +589,7 @@
                                             "ID": "6c7b7dc64b644d0cadaa3e58ae25fb27"
                                           }
                                         ],
-                                        "ID": "9b6f052d-57be-459a-9cfe-6024f3804c31"
+                                        "ID": "71243830-5216-40a3-a6b1-5939b0753a02"
                                       },
                                       {
                                         "Condition": {
@@ -638,7 +638,7 @@
                                             "ID": "3ea9bb1ee1c34288bc51654ef1abf496"
                                           }
                                         ],
-                                        "ID": "36341f45-c565-45b2-8eea-7425d38cb4c1"
+                                        "ID": "122e532e-7bf9-416e-8429-2be97ef447db"
                                       },
                                       {
                                         "CommandList": [
@@ -658,13 +658,13 @@
                                             "ID": "2aef2dc2638a4d93b234647dbb3708be"
                                           }
                                         ],
-                                        "ID": "cb216769-5e98-4130-a383-5630ee8b5756"
+                                        "ID": "e37a30f6-824b-4309-b099-b50321d85357"
                                       }
                                     ]
                                   }
                                 ],
                                 "Comments": "优先使用手动指定的提成金额",
-                                "ID": "c2cdacc3-0614-4a16-a0eb-d486d11a01d4"
+                                "ID": "3c4043b9-0284-477c-81f1-63f1c8d5119c"
                               },
                               {
                                 "CommandList": [
@@ -684,7 +684,7 @@
                                     "ID": "c4fead524128456483f3f5a034ef3aac"
                                   }
                                 ],
-                                "ID": "fb135ab1-2aac-43f2-9282-f34f0a34dc21"
+                                "ID": "12836376-7996-426b-89ac-c4d2903707c9"
                               }
                             ],
                             "Comments": "计算成员的时薪"
@@ -823,13 +823,13 @@
                                                   }
                                                 ],
                                                 "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
-                                                "ID": "ab6e8070-011c-46cf-b195-7596fcf2998d"
+                                                "ID": "62c323bb-a8fd-4f6a-bef3-c12ba2a4c36e"
                                               }
                                             ]
                                           }
                                         ],
                                         "Comments": "如果分配到人头，则判断该人总计划工时还够不够",
-                                        "ID": "096dcda9-2b0e-4306-98f9-ed7c1aee6088"
+                                        "ID": "3008b6ad-c950-48cd-b0f1-8e43800742ad"
                                       },
                                       {
                                         "Condition": {
@@ -929,13 +929,13 @@
                                                   }
                                                 ],
                                                 "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
-                                                "ID": "d922d6c5-7e61-422c-a1e5-4b254fc30707"
+                                                "ID": "5e7fd067-2fb4-4012-bbd2-c5dfa130297e"
                                               }
                                             ]
                                           }
                                         ],
                                         "Comments": "如果是共用任务工时，则查看任务计划工时够不够",
-                                        "ID": "81b3873d-5aab-4656-a210-27103bc25954"
+                                        "ID": "9388a07b-e142-40cd-916d-9e9611d3e10b"
                                       }
                                     ]
                                   },
@@ -977,7 +977,7 @@
                                       },
                                       "TopCount": "1"
                                     },
-                                    "ID": "b7abf874642d441799e38adc4a83c517",
+                                    "ID": "9531597e7dd04790a8b3d8edf8a056fa",
                                     "Comments": "从视图统计项目的信息"
                                   },
                                   {
@@ -1015,13 +1015,13 @@
                                             "Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。"
                                           }
                                         ],
-                                        "ID": "449853d5-df3d-47c8-bd5d-4d5576ea30b8"
+                                        "ID": "94f1c942-3547-4a4f-b90c-80abf2f29da0"
                                       }
                                     ]
                                   }
                                 ],
                                 "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
-                                "ID": "80f2fd34-243c-4dad-8ba8-3c2501911440"
+                                "ID": "c218eb9f-1c2a-4ad1-94c2-f987d31caaa3"
                               }
                             ]
                           },
@@ -1080,14 +1080,6 @@
                                             "GUID": "21ea4bc4-f68e-446b-9760-413f048a32ea"
                                           },
                                           "ColumnName": "总实际工时"
-                                        },
-                                        {
-                                          "BindingInfo": {
-                                            "TableName": "View_任务工时统计",
-                                            "ColumnName": "总剩余工时",
-                                            "GUID": "93c3c2b9-a863-42a1-9eab-7159aaa0f7a7"
-                                          },
-                                          "ColumnName": "总剩余工时"
                                         }
                                       ],
                                       "SqlCondition": {
@@ -1132,7 +1124,7 @@
                                         ]
                                       }
                                     },
-                                    "ID": "1742b464cefc45548e4051a84a1b4d26"
+                                    "ID": "bc9f93f8c0874fefba55401ba5796ea6"
                                   },
                                   {
                                     "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -1161,10 +1153,10 @@
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                               "SerializeProperty": "=ROUNDUP(核定工时/分配天数,1)"
                                             },
-                                            "ID": "0a6bb6880fa44256b05d2356d87df007"
+                                            "ID": "16367bf85236447fb1f75968ab5e3c35"
                                           }
                                         ],
-                                        "ID": "a205ba40-f3e8-40e3-84ee-69fadd53b39b"
+                                        "ID": "aec2fbae-83f7-48e5-ab7a-5fae797b336e"
                                       },
                                       {
                                         "CommandList": [
@@ -1175,10 +1167,10 @@
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                               "SerializeProperty": "=ROUNDUP(待分配工时,1)"
                                             },
-                                            "ID": "d298d7ee2bed4e108a7671a1a6475966"
+                                            "ID": "e94b98e14b7a4a5ba0254784a076d6cc"
                                           }
                                         ],
-                                        "ID": "21e85c17-929e-4c55-b312-e208965027b6"
+                                        "ID": "4d5a916f-49ba-45ec-bce5-69454395a99c"
                                       }
                                     ]
                                   },
@@ -1220,13 +1212,13 @@
                                                     "ParameterName": "本次核定工时",
                                                     "ParameterValue": {
                                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                                      "SerializeProperty": "=IF(计算本次分配工时>统计工时.总剩余工时,统计工时.总剩余工时,计算本次分配工时)"
+                                                      "SerializeProperty": "=IF(计算本次分配工时>(个人工时情况.总计划工时-个人工时情况.总实际工时),(个人工时情况.总计划工时-个人工时情况.总实际工时),计算本次分配工时)"
                                                     },
-                                                    "ID": "cfba414b12c9457984f4451f7b08a1eb"
+                                                    "ID": "227013c4596747f7b28cd8fcfff02773"
                                                   }
                                                 ],
                                                 "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，",
-                                                "ID": "3a1f2c61-8a35-4394-adbe-7502a81a8999"
+                                                "ID": "07879862-2b57-48db-9176-57f5de797991"
                                               },
                                               {
                                                 "CommandList": [
@@ -1237,10 +1229,10 @@
                                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                                       "SerializeProperty": "=计算本次分配工时"
                                                     },
-                                                    "ID": "b54545f6b13d4b8697add0630e495a6b"
+                                                    "ID": "f0457ba04eb3495e809ef050fb21fe4f"
                                                   }
                                                 ],
-                                                "ID": "4bc8ac5e-efae-48b2-8768-fdab0f34ef8f"
+                                                "ID": "32327428-2991-4210-94d0-fbdfc7587c44"
                                               }
                                             ]
                                           },
@@ -1254,7 +1246,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "项目ID",
-                                                  "GUID": "fda79c92-f467-4574-9c32-f0b801a012ac"
+                                                  "GUID": "a3028e2b-e561-42c6-9ee0-c8eb03134e2e"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1265,7 +1257,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "任务ID",
-                                                  "GUID": "770c4415-4e21-4f8c-a597-abd7f04a0bfd"
+                                                  "GUID": "735e3d1d-b8b9-4ba3-a88a-0e21b9765cbb"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1276,7 +1268,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时日期",
-                                                  "GUID": "2bc8dc66-9ca8-4604-8b97-08dbbc9a626a"
+                                                  "GUID": "cffbc1e3-052a-486b-89ec-6078865f6e90"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1287,7 +1279,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时类型",
-                                                  "GUID": "9789ce12-dd35-4498-9b72-76c43e4e2144"
+                                                  "GUID": "e07c6e0d-1142-463c-a205-880c29183a0d"
                                                 },
                                                 "Value": "实际"
                                               },
@@ -1295,7 +1287,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "执行人",
-                                                  "GUID": "ec1c5767-50ba-447b-837b-d4666cdd9f2d"
+                                                  "GUID": "58b7816a-560e-4ab2-95b5-b8a8f04d6c19"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1306,7 +1298,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "执行内容",
-                                                  "GUID": "4e77c9cd-5d2d-4d0e-8332-038313abf74f"
+                                                  "GUID": "083276ff-58a1-47be-89fc-cd4989e8e4d4"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1317,7 +1309,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "工时",
-                                                  "GUID": "f72ee1ba-2be6-42d8-aef7-ffd0bc436f3e"
+                                                  "GUID": "36adcdcf-f764-4fdd-8bf8-852b9d0af714"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1328,7 +1320,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "上报工时",
-                                                  "GUID": "34a6d798-74c3-4ceb-a2df-8ad4cd476b42"
+                                                  "GUID": "eb754d4a-fdd1-4610-8d64-80882781bdaf"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1339,7 +1331,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "时薪单价",
-                                                  "GUID": "c2270dad-808a-4a8b-8489-95d218b811f3"
+                                                  "GUID": "2787b855-d8ee-4214-8c5e-654f37c81bee"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1350,7 +1342,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "提成系数",
-                                                  "GUID": "bd688763-4c3e-4486-8153-d908dfc3dd6b"
+                                                  "GUID": "d3df389a-4ca3-4353-aefd-d8035b965e93"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1361,7 +1353,7 @@
                                                 "BindingInfo": {
                                                   "TableName": "任务工时表",
                                                   "ColumnName": "时薪来源",
-                                                  "GUID": "f5922f75-cb51-4a11-bc6e-52b1e145d543"
+                                                  "GUID": "4c3d1a7c-5e48-48dd-9f2f-0e28f5bc1550"
                                                 },
                                                 "Value": {
                                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1377,10 +1369,10 @@
                                               "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                               "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)"
                                             },
-                                            "ID": "5d5c7f7462d24dc2aac507bf580830d5"
+                                            "ID": "81a6634be71a43669cbaa18cb041393a"
                                           }
                                         ],
-                                        "ID": "2518bb0b-a019-448d-8a4c-a0d160317347"
+                                        "ID": "dc0a2408-a1e6-4094-84db-1d38ba286103"
                                       },
                                       {
                                         "CommandList": [
@@ -1393,7 +1385,7 @@
                                             }
                                           }
                                         ],
-                                        "ID": "eed828f6-8f26-4a77-8e83-eb71586e1d44"
+                                        "ID": "a1751d3f-23dc-4468-81ef-939d95acbd61"
                                       }
                                     ]
                                   }
@@ -1409,7 +1401,7 @@
                                     "BindingInfo": {
                                       "TableName": "项目动态",
                                       "ColumnName": "项目ID",
-                                      "GUID": "657294a7-01c3-4e27-9a65-1e840457d870"
+                                      "GUID": "2a44e36c-2422-47b0-8572-6ca620733990"
                                     },
                                     "Value": {
                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1420,7 +1412,7 @@
                                     "BindingInfo": {
                                       "TableName": "项目动态",
                                       "ColumnName": "项目动态",
-                                      "GUID": "5dcbe3d4-7544-4e8a-bacd-fbc771aed2cc"
+                                      "GUID": "eb8e7fe5-80bd-4b7d-a6d0-175adcf06de8"
                                     },
                                     "Value": {
                                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -1431,7 +1423,7 @@
                                     "BindingInfo": {
                                       "TableName": "项目动态",
                                       "ColumnName": "执行人",
-                                      "GUID": "e7eba9e1-edcf-4a25-a4fb-371d2eaaa4c4"
+                                      "GUID": "8cdf3828-fe23-4904-886b-da111157683f"
                                     },
                                     "Value": "%CurrentUser%"
                                   }
@@ -1445,7 +1437,7 @@
                             "Message": "报工成功"
                           }
                         ],
-                        "ID": "d1fdad64-b486-47b5-82fb-f02a215bbccb"
+                        "ID": "b728b35b-37b0-4979-9b51-2f3bfcaac0e1"
                       },
                       {
                         "CommandList": [
@@ -1458,12 +1450,12 @@
                             }
                           }
                         ],
-                        "ID": "4d25467c-a496-40ef-b621-fbb6586924bb"
+                        "ID": "14c3dd1e-b660-4b79-b4dc-8f55f163e0b4"
                       }
                     ]
                   }
                 ],
-                "ID": "e7271fbf-3edb-4ebe-b4df-40c63c757ee5"
+                "ID": "f5991806-add2-4d20-b266-f17d2e60d061"
               },
               {
                 "CommandList": [
@@ -1473,7 +1465,7 @@
                     "Message": "成员不在任务内，无法报工！"
                   }
                 ],
-                "ID": "8ac54198-db2f-4d23-a42c-ed7d9435c2ef"
+                "ID": "447cf554-6508-427a-ace5-0592f83b8e2e"
               }
             ]
           }

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

@@ -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,