From 6efd402c1f16d9c7fcf7f7a90fa137050b1eda5b Mon Sep 17 00:00:00 2001
From: cuckooent <phoben@qq.com>
Date: Fri, 18 Oct 2024 22:29:33 +0800
Subject: [PATCH] =?UTF-8?q?{"Message":"=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=A0=BC=E5=BC=8F","MessageType":2,"Modules"?=
 =?UTF-8?q?:[{"State":1,"Type":15,"Name":"ServerCommand/=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6"}],"Version":"v1"}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .collaboration                        | 11 +-------
 ServerCommands/工时/上报实际工时.json | 36 +++++++++++++--------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/.collaboration b/.collaboration
index c415b746..d9f73e2f 100644
--- a/.collaboration
+++ b/.collaboration
@@ -1382,16 +1382,7 @@
   },
   {
     "ModuleName": "ServerCommand/上报实际工时",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-10-18T22:25:48.4579836+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\工时\\上报实际工时.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "ServerCommands/客户",
diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json
index 2771df19..01be45e2 100644
--- a/ServerCommands/工时/上报实际工时.json
+++ b/ServerCommands/工时/上报实际工时.json
@@ -59,7 +59,7 @@
         {
           "Name": "进展内容",
           "DataValidationInfo": {},
-          "TestData": "测试\r\n2323\r\n333\r\n444"
+          "TestData": "1. 测试\r\n2.2323\r\n3、333\r\n4. 444"
         },
         {
           "Name": "指定时薪单价",
@@ -455,7 +455,7 @@
                                             "ID": "2d719d51ef5a46ee9aa64f113a34cce3"
                                           }
                                         ],
-                                        "ID": "9a37c2c6-2190-450d-ad57-35d2cf5261f3"
+                                        "ID": "6ef977a6-31ee-47d9-b3fb-80fb70bf2b55"
                                       },
                                       {
                                         "CommandList": [
@@ -478,7 +478,7 @@
                                             "ID": "11255bb1a556487e972cf64b9d1da58b"
                                           }
                                         ],
-                                        "ID": "60de0c6e-d57f-4a60-a259-0a43d3228324"
+                                        "ID": "e4418e4a-5bc3-4432-8273-e1638da05f0f"
                                       }
                                     ]
                                   },
@@ -560,7 +560,7 @@
                                                           }
                                                         ],
                                                         "Comments": "如果是分配到天，就检测当前日期该人员在任务里的计划工时是否够用",
-                                                        "ID": "9d3af92c-4280-4b22-85ae-445d3d1ff44a"
+                                                        "ID": "fe227670-3fe8-4e10-8751-f6739c860526"
                                                       },
                                                       {
                                                         "CommandList": [
@@ -574,13 +574,13 @@
                                                             "ID": "82c651b1c1424340b8c6b3ed1361b1fd"
                                                           }
                                                         ],
-                                                        "ID": "de361bdc-04f0-4f87-886f-be806c4090ae"
+                                                        "ID": "ddfbde9c-2e11-4c19-9a15-656123b759dc"
                                                       }
                                                     ]
                                                   }
                                                 ],
                                                 "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，",
-                                                "ID": "606efb9f-8935-4558-b6dc-55462184a3df"
+                                                "ID": "fda85e7f-7e7f-405a-9c29-5b3fbc8e91aa"
                                               },
                                               {
                                                 "CommandList": [
@@ -594,7 +594,7 @@
                                                     "ID": "3f324a9712e14a6693472fa215c3143f"
                                                   }
                                                 ],
-                                                "ID": "a37dd95f-f863-4585-a9dc-c27b3167ce36"
+                                                "ID": "c0fe2852-5125-412c-8119-60037a13a341"
                                               }
                                             ]
                                           },
@@ -667,10 +667,10 @@
                                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                                           "SerializeProperty": "=进展内容item"
                                                         },
-                                                        "ID": "cf8b8696e5de4c07a2decd0a96ecbd32"
+                                                        "ID": "5b0e29af5b49431cbdc2a2be6a209bca"
                                                       }
                                                     ],
-                                                    "ID": "a94c2240-a723-4699-a52c-bf6f9465c72c"
+                                                    "ID": "96306f1c-e2e5-4bca-bb2d-087b10a16223"
                                                   },
                                                   {
                                                     "Condition": {
@@ -693,10 +693,10 @@
                                                           "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                                                           "SerializeProperty": "=\" - \"&进展内容item"
                                                         },
-                                                        "ID": "c5ba4333eaa74383865c88f5fef78aba"
+                                                        "ID": "c7bda900d47f48b1a4fe567434981c90"
                                                       }
                                                     ],
-                                                    "ID": "323e841a-40a4-4712-8e3f-54fc50cf9902"
+                                                    "ID": "639eab23-a548-4c45-a9fe-db3852a0ccfe"
                                                   }
                                                 ]
                                               },
@@ -1006,7 +1006,7 @@
                                                       }
                                                     ],
                                                     "Comments": "如果是分配到任务，就补一条计划，保证任务可分配工时准确",
-                                                    "ID": "2b3bad5c-d3eb-433f-93ee-14750e95eee6"
+                                                    "ID": "bbca403a-4b80-42f2-b01b-37c5ed4558c1"
                                                   }
                                                 ],
                                                 "Disabled": true
@@ -1032,7 +1032,7 @@
                                             "ID": "dfe08a493a80498e8915bc2fe710ad21"
                                           }
                                         ],
-                                        "ID": "4d378d45-b835-41b2-b6e8-79d7e22e676b"
+                                        "ID": "caf85a37-534c-401c-a411-be741c1b124b"
                                       },
                                       {
                                         "CommandList": [
@@ -1045,7 +1045,7 @@
                                             }
                                           }
                                         ],
-                                        "ID": "dc414c94-a60b-44be-bf7b-b40857f672cb"
+                                        "ID": "c663c749-30b8-4dec-9788-3af5f2482288"
                                       }
                                     ]
                                   }
@@ -1105,7 +1105,7 @@
                             "Message": "报工成功"
                           }
                         ],
-                        "ID": "941aa2a7-b518-4d4b-99bb-6f9f3f667e15"
+                        "ID": "4a14c745-1adb-4a1d-9d3f-397ac2ee8c92"
                       },
                       {
                         "CommandList": [
@@ -1121,12 +1121,12 @@
                             }
                           }
                         ],
-                        "ID": "c710539a-b45e-44ab-9a1a-fb22c0f4a283"
+                        "ID": "d7b7ad6d-786d-4216-a94a-41757ecd5f6c"
                       }
                     ]
                   }
                 ],
-                "ID": "522dc98d-68d6-4430-bba6-a578c285d43e"
+                "ID": "f7f19e27-1fb3-4553-b508-2a3c0be86b1b"
               },
               {
                 "CommandList": [
@@ -1139,7 +1139,7 @@
                     }
                   }
                 ],
-                "ID": "11623524-397c-45bd-8304-8a12cd035e0f"
+                "ID": "446f2be7-3563-4216-8cbe-f53aa9a8db3f"
               }
             ]
           }