diff --git a/.collaboration b/.collaboration index a5be551b..e6a1bf09 100644 --- a/.collaboration +++ b/.collaboration @@ -1026,29 +1026,11 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:48:08.5178608+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/分配任务工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-17T17:51:44.9844727+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\分配任务工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommands/项目", diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index f8ae393a..94969a07 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -252,7 +252,7 @@ "SerializeProperty": "=任务信息.任务状态" } }, - "value": "1" + "value": "2" }, "CommandList": [ { @@ -488,7 +488,7 @@ "ID": "ca981e56b58e4a889cce1e811fc89764" } ], - "ID": "1fb661f5-5a47-4204-baae-4e8886a5ff30" + "ID": "39902c93-82c4-4580-a266-16438149f41c" }, { "CommandList": [ @@ -502,7 +502,7 @@ "ID": "5e88c98d260e4a2bacdc4d385f1855f1" } ], - "ID": "cb4176e7-ea64-4fb1-a7fa-1c2b699a5f06" + "ID": "88693b1d-5a25-49df-b791-d05bb8cac2c6" } ] }, @@ -550,7 +550,7 @@ } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "2dde94c0-7330-42eb-89b8-b4b76be7c877" + "ID": "d3b0c8b4-a92e-4a4b-8ff9-6baeae7ad1c3" }, { "CommandList": [ @@ -564,7 +564,7 @@ "ID": "9f4c8206193a47cfa79333c2dbb3d2a7" } ], - "ID": "af728b18-95d1-450e-a5cd-be667bbfd00e" + "ID": "0d4d56cc-5e73-4866-bee7-3981486062e1" } ] }, @@ -704,7 +704,7 @@ "ID": "d9e13b85ae5640d5972aeb4ea3180a34" } ], - "ID": "8f35f553-c5e2-4deb-bb6a-5e27504c57ee" + "ID": "fb423c2a-3093-4949-85fc-acd5cf1ab088" }, { "CommandList": [ @@ -717,7 +717,7 @@ } } ], - "ID": "f6623b87-1f6f-4156-84bd-61bb75f24282" + "ID": "b2d6e256-a62b-45a2-91c4-cf5bc665fbe4" } ] } @@ -769,7 +769,7 @@ "Message": "报工成功" } ], - "ID": "46cf7bda-de4d-4f0f-9318-f5636247e4aa" + "ID": "9a1d366b-6d1e-4e49-9ade-cfa3e047d8e0" }, { "CommandList": [ @@ -785,12 +785,12 @@ } } ], - "ID": "cbfae901-7bbe-454e-8493-01d2bdebbcb5" + "ID": "b669ba4b-ca62-4593-8b79-f620ddcb51c2" } ] } ], - "ID": "90c131c6-09dd-4dcc-bf85-52bfc5294d9d" + "ID": "d0700d0f-c5a3-46f5-b847-fec206dcca1c" }, { "CommandList": [ @@ -803,7 +803,7 @@ } } ], - "ID": "a0920b31-09f4-4105-8104-54551219f8b0" + "ID": "51a50473-a7d7-49bf-a83a-674e7728241d" } ] } diff --git a/ServerCommands/工时/分配任务工时.json b/ServerCommands/工时/分配任务工时.json index 92ec56f9..c3d2a028 100644 --- a/ServerCommands/工时/分配任务工时.json +++ b/ServerCommands/工时/分配任务工时.json @@ -552,7 +552,7 @@ "ParamNameToSaveNewRowValue": "" } ], - "ID": "6c1e8d9b-d4cb-4783-b65e-076440420f9d" + "ID": "0bd18cbb-a844-4095-a00f-6a877d53665a" } ] }, @@ -569,8 +569,7 @@ "SerializeProperty": "=任务信息.任务状态" } }, - "value": "2", - "compareType": 4 + "value": "2" }, "CommandList": [ { @@ -608,7 +607,7 @@ "ID": "91295edff0c44f608a14d5c9f9594f3e" } ], - "ID": "4c1de5b7-d4b7-4a30-8972-a1ad9e5df072" + "ID": "7ff31778-96c4-49d8-a32e-181f1b88b2e6" }, { "Condition": { @@ -642,7 +641,7 @@ "ID": "727f49edcb914303adf91ed9a40e4355" } ], - "ID": "10594e50-820d-443a-916a-a3fc7132aa36" + "ID": "a3eacd5e-5297-4364-929a-a379f9d176a2" } ], "Comments": "如果是按人分配，则把计划工时分到一天中" @@ -778,7 +777,7 @@ "ID": "622dd1eb09094e29b7b7201423479597" } ], - "ID": "e12d9c97-b76e-4dd5-a478-1982b8c75ab0" + "ID": "d270ce8e-1204-4687-9a4d-14ee1ddc0691" }, { "CommandList": [ @@ -792,7 +791,7 @@ "ID": "22bbafd761814075a115c7c935a993c0" } ], - "ID": "3b1c4222-3284-44b8-929a-dd8cbf2e16a4" + "ID": "ed8387f8-b258-40e1-9195-4e4712d18e37" } ] }, @@ -1010,7 +1009,7 @@ } ], "Comments": "如果不是按人分配，且分配后的工时超过负荷，则报错", - "ID": "9061a566-81c9-41b7-aaa4-22f12b58547a" + "ID": "71e79c72-7c77-4b1e-aab2-62c9e03840ef" }, { "CommandList": [ @@ -1023,7 +1022,7 @@ } } ], - "ID": "4a9fb2e2-725b-44e9-939b-782d1f65bb2d" + "ID": "3d1a9493-f089-4e32-a390-edf55b9e0b03" } ] } @@ -1037,7 +1036,7 @@ "Message": "分配计划工时成功" } ], - "ID": "a6915e7f-2af7-4c2b-8559-e8e95b2ee1f4" + "ID": "94615ed0-db4a-4df9-bdcc-984dbb65c8ac" }, { "CommandList": [ @@ -1050,12 +1049,12 @@ } } ], - "ID": "9e608920-1c99-4f3a-bcd3-67495c0ede83" + "ID": "e0664fed-3947-4260-a369-10fccfdb3ef8" } ] } ], - "ID": "6a206308-2548-4e99-93a6-afa74226aeca" + "ID": "18650228-2adb-4ffe-aa61-43a756ea484d" }, { "CommandList": [ @@ -1065,13 +1064,13 @@ "Message": "该用户不是项目成员" } ], - "ID": "dfdb5e7d-eb37-457c-805d-9055b99c577d" + "ID": "03fd3568-5f3f-4c67-87d9-371faf16c203" } ], "Comments": "如果任务成员中没有，则自动加一个" } ], - "ID": "37421a83-618c-4cc0-9679-c3f07b3ea2a3" + "ID": "dfbf8fce-7699-473c-9cf1-df9213ac03eb" }, { "CommandList": [ @@ -1081,12 +1080,12 @@ "Message": "您提交的工时超过任务预算工时，请修改后重新提交" } ], - "ID": "522e7c4e-2b61-4881-9128-67ac30598c01" + "ID": "b4fa3949-72a8-49c5-8c2a-558650f2a1c9" } ] } ], - "ID": "10556db7-c403-4e70-adab-174b7e37be63" + "ID": "33a1a0f8-ce40-4316-b8d0-60764e4a6b41" }, { "CommandList": [ @@ -1096,7 +1095,7 @@ "Message": "任务不存在" } ], - "ID": "2e83c18b-158b-4e56-97ac-d7132ac0f46a" + "ID": "7947ba67-09bd-4337-aba3-8c658c79bea4" } ] }