diff --git a/.collaboration b/.collaboration index 5548a833..bc63c6b5 100644 --- a/.collaboration +++ b/.collaboration @@ -349,16 +349,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:59:24.7128637+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/项目", @@ -1091,17 +1082,7 @@ }, { "ModuleName": "PCPage/开发测试", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:34:13.6362006+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\开发测试.json", - "Pages\\系统\\开发测试.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/更新日志", @@ -1977,16 +1958,7 @@ }, { "ModuleName": "ServerCommand/创建任务审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:34:31.2798336+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\创建任务审批待办.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/删除钉钉待办", @@ -1998,29 +1970,11 @@ }, { "ModuleName": "ServerCommand/创建项目审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:34:13.631703+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\创建项目审批待办.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/创建工时申请审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:34:40.8719319+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\创建工时申请审批待办.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/Basic更新待办", @@ -2028,16 +1982,7 @@ }, { "ModuleName": "ServerCommand/更新审批待办", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:35:08.2782509+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\更新审批待办.json" - ] + "ModuleType": 15 }, { "ModuleName": "ShareCommandContainer/跳转当前项目", @@ -2125,45 +2070,15 @@ }, { "ModuleName": "ProcessItem/项目立项流程", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:34:13.6369426+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\项目立项流程.json", - "Process\\项目立项流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/预算申请", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:34:40.8719396+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\预算申请.json", - "Process\\预算申请.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/新增任务流程", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-03-03T20:34:31.2798398+08:00", - "ModuleType": 28, - "ToRemoveFiles": [ - "Process\\新增任务流程.json", - "Process\\新增任务流程.bpmn" - ] + "ModuleType": 28 }, { "ModuleName": "ProcessItem/反馈处理流程", diff --git a/Process/新增任务流程.bpmn b/Process/新增任务流程.bpmn index d457e94f..ff4326dd 100644 --- a/Process/新增任务流程.bpmn +++ b/Process/新增任务流程.bpmn @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - + Flow_0otbu5x Flow_1bfvbmv diff --git a/Process/项目立项流程.bpmn b/Process/项目立项流程.bpmn index 103fdcbc..a6f0edbf 100644 --- a/Process/项目立项流程.bpmn +++ b/Process/项目立项流程.bpmn @@ -4,7 +4,7 @@ 用于项目的立项申请审批 - + @@ -14,7 +14,7 @@ - + Flow_0cq5pfu _8c854f9d-40d8-4aed-acb1-6778e09b2e08 diff --git a/Process/预算申请.bpmn b/Process/预算申请.bpmn index b799b72d..1e60404f 100644 --- a/Process/预算申请.bpmn +++ b/Process/预算申请.bpmn @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + Flow_1mecf6x Flow_10prhsv diff --git a/ServerCommands/钉钉/创建任务审批待办.json b/ServerCommands/钉钉/创建任务审批待办.json index 296641f1..dcef2c3d 100644 --- a/ServerCommands/钉钉/创建任务审批待办.json +++ b/ServerCommands/钉钉/创建任务审批待办.json @@ -79,7 +79,8 @@ "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon", "Name": "流程任务ID", "DataValidationInfo": { - "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon" + "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon", + "IgnoreBlank": false } } ] diff --git a/ServerCommands/钉钉/创建工时申请审批待办.json b/ServerCommands/钉钉/创建工时申请审批待办.json index 8f693df6..72df2837 100644 --- a/ServerCommands/钉钉/创建工时申请审批待办.json +++ b/ServerCommands/钉钉/创建工时申请审批待办.json @@ -79,7 +79,8 @@ "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon", "Name": "流程任务ID", "DataValidationInfo": { - "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon" + "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon", + "IgnoreBlank": false } } ] diff --git a/ServerCommands/钉钉/创建项目审批待办.json b/ServerCommands/钉钉/创建项目审批待办.json index 33778ff5..8017740e 100644 --- a/ServerCommands/钉钉/创建项目审批待办.json +++ b/ServerCommands/钉钉/创建项目审批待办.json @@ -80,7 +80,8 @@ "$type": "Forguncy.SaveLoad.PostRequestParameterSaveData, ServerDesignerCommon", "Name": "流程任务ID", "DataValidationInfo": { - "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon" + "$type": "Forguncy.SaveLoad.DataValidationInfoSaveData, ServerDesignerCommon", + "IgnoreBlank": false } } ] diff --git a/ServerCommands/钉钉/更新审批待办.json b/ServerCommands/钉钉/更新审批待办.json index 245ddc98..497dbc6e 100644 --- a/ServerCommands/钉钉/更新审批待办.json +++ b/ServerCommands/钉钉/更新审批待办.json @@ -110,7 +110,7 @@ "$values": [ { "$type": "Forguncy.Model.Commands.ParameterTableValueColumn, ServerDesignerCommon", - "GUID": "922f4ec1-4bea-4d7c-a48a-06cf5eb7d606", + "GUID": "0a60c6a8-348d-4f64-9e44-067ff5949e63", "BindingInfo": { "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "钉钉待办储存表", @@ -137,7 +137,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "22c9b2c206a04a9da182fd20729d12cd", + "ID": "cf2d102880a64d03b4b9aef27b97e75c", "BreakpointIdentity": "7c884be8-c2f2-4995-94cb-d6821c1a8580" }, { @@ -246,12 +246,16 @@ } ] }, - "ID": "e8fe733b-a360-446e-98ec-dc4c2034bb02" + "ID": "dcdb443b-2deb-42f3-aca2-9916266e3a41" } ] }, "BreakpointIdentity": "c879abda-374a-4860-890a-e2df6800fe3f" } ] + }, + "ReturnProperties": { + "$type": "System.Collections.Generic.List`1[[Forguncy.SaveLoad.ReturnPropertySaveData, ServerDesignerCommon]], System.Private.CoreLib", + "$values": [] } } \ No newline at end of file