diff --git a/.collaboration b/.collaboration index 2c84108d..583d1637 100644 --- a/.collaboration +++ b/.collaboration @@ -9,47 +9,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361463+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361666+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361692+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -218,137 +188,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361764+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361784+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361802+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.936182+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361837+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.936186+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361875+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.936189+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361918+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -389,17 +269,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9361948+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -1176,16 +1046,7 @@ }, { "ModuleName": "ServerCommand/上报实际工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:34:57.1268172+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\上报实际工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/分配任务工时", @@ -1701,19 +1562,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-11T15:33:17.9365212+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index 008c298a..009269d3 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/ServerCommands/工时/上报实际工时.json b/ServerCommands/工时/上报实际工时.json index fed8c2ac..285a6992 100644 --- a/ServerCommands/工时/上报实际工时.json +++ b/ServerCommands/工时/上报实际工时.json @@ -538,7 +538,7 @@ "ID": "3c1021e484ee4ba0a86633071b42d8bd" } ], - "ID": "455748fb-192a-47d2-b2dc-9364da36c526" + "ID": "72a48abc-3287-4b20-aca4-e99fd45c6e2e" }, { "Condition": { @@ -570,7 +570,7 @@ "ID": "0219a753cc25405babd85823afc50ec5" } ], - "ID": "e9ab085a-cdaa-4723-9ae4-1335e00583f1" + "ID": "72339fec-fb5e-442b-b094-63af076a1e30" }, { "Condition": { @@ -602,7 +602,7 @@ "ID": "b63bc48e6b494c45846f26f65967743a" } ], - "ID": "dbd2f3f0-ff35-44b7-ae1a-2bea18438273" + "ID": "cbd1917f-e028-447b-b633-8f13cd660b61" }, { "CommandList": [ @@ -619,13 +619,13 @@ "ID": "fa7dce870a0f4f43982f5750b827a883" } ], - "ID": "d3b12ed1-7585-4f28-b3b8-b29e5149e137" + "ID": "dc54e2ce-5007-45bc-aece-30efdfc30e9a" } ] } ], "Comments": "优先使用手动指定的提成金额", - "ID": "54be83c7-f788-46c1-a57f-b16ba0231092" + "ID": "75dc174d-b5c2-47b4-ac2f-b0e329cab3bf" }, { "CommandList": [ @@ -645,7 +645,7 @@ "ID": "33c8559bb723411da60fd2e561aba45d" } ], - "ID": "a3d5b431-a3c6-4f02-80a0-6dbff1700cf6" + "ID": "80390d7c-7d47-4348-85de-a2765480cfcb" } ], "Comments": "计算成员的时薪" @@ -787,13 +787,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "1ff2d3b4-a01f-4453-8b04-925fa915acce" + "ID": "37e1bb05-fe80-41a5-8282-b2179ada0c44" } ] } ], "Comments": "如果分配到人头，则判断该人总计划工时还够不够", - "ID": "a189647f-1e07-41f1-b3b7-f3912911f83f" + "ID": "7def3327-843f-4f27-b4f6-f0add9ea6e94" }, { "Condition": { @@ -896,13 +896,13 @@ } ], "Comments": "先检查个人工时余额够不够，如果不够，直接提成为0", - "ID": "80ecdc18-f6a4-486a-9428-b79a9dd34129" + "ID": "a8c79a26-b40b-48a5-9c08-9581a6f5259a" } ] } ], "Comments": "如果是共用任务工时，则查看任务计划工时够不够", - "ID": "bc751610-437e-4200-b439-75b54ad1e5b4" + "ID": "a74f135c-a3b2-4c6f-aeac-445c24c4f0ab" } ] }, @@ -984,13 +984,13 @@ "Message": "该项目预算费用不足，为确保项目成本可控，请联系项目经理增加项目预算后再提交。" } ], - "ID": "78e16155-edfc-41fc-b298-f0d8db36f48a" + "ID": "8ab649d3-6a6d-46b4-90e6-2e5453c6f7ec" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标", - "ID": "04e3a91d-a8dd-4c78-a1c5-b52a36aca633" + "ID": "18be261b-ce6e-4f1d-9c8d-7163d0f086da" } ] }, @@ -1127,7 +1127,7 @@ "ID": "16367bf85236447fb1f75968ab5e3c35" } ], - "ID": "485fdddc-218d-42d0-b18e-2df4126fcea8" + "ID": "ffa99e50-8e2f-4dd8-b9b7-e93a0ff8b167" }, { "CommandList": [ @@ -1141,7 +1141,7 @@ "ID": "e94b98e14b7a4a5ba0254784a076d6cc" } ], - "ID": "aa462285-7c3c-48a3-850f-6014000b14a2" + "ID": "935239bd-c50f-4673-817d-071c6a61d36b" } ] }, @@ -1189,7 +1189,7 @@ } ], "Comments": "如果是按天分配，则需要检测这一天的实际工时是否超出，", - "ID": "4e97d216-a750-46c2-a73c-9116fe582506" + "ID": "c9837137-4494-46dd-9d25-189335b63042" }, { "CommandList": [ @@ -1203,7 +1203,7 @@ "ID": "f0457ba04eb3495e809ef050fb21fe4f" } ], - "ID": "6725d161-13e6-4aa6-bd63-0c7180463163" + "ID": "955c9eee-4321-4e6c-bd02-e2d3afd7eb2d" } ] }, @@ -1343,7 +1343,7 @@ "ID": "e446ff2c85514cc681efe1c72c5c0700" } ], - "ID": "b1d1bd74-d2c6-4aac-8157-80fdf47d8fe8" + "ID": "8b51230f-b4eb-4b7c-b569-303a71720072" }, { "CommandList": [ @@ -1356,7 +1356,7 @@ } } ], - "ID": "92d67cca-b45c-4133-b0a3-f217a5910313" + "ID": "32611da4-2422-4941-a8c6-471c4c62ab39" } ] } @@ -1408,7 +1408,7 @@ "Message": "报工成功" } ], - "ID": "498f5ed0-da23-4968-8e42-349ddc14d1a4" + "ID": "ac431156-a186-4b6c-a11a-de6f2bb84b46" }, { "CommandList": [ @@ -1421,12 +1421,12 @@ } } ], - "ID": "ea8a1c7f-ec7a-4fa4-a3a2-e8bb523d5496" + "ID": "e4c2592d-75b0-4351-8384-71209c08b40b" } ] } ], - "ID": "517b9493-a655-4580-89bb-1688bbedfa15" + "ID": "82f7b0f9-10a8-4c6c-b2ef-eb0fe8d029fd" }, { "CommandList": [ @@ -1436,7 +1436,7 @@ "Message": "成员不在任务内，无法报工！" } ], - "ID": "3a9585bd-07ff-4d73-917d-fa3b575d6d9f" + "ID": "041b384e-5061-4226-8a9e-fd6f427ebfb1" } ] }