diff --git a/.collaboration b/.collaboration index 43579053..7f198eb6 100644 --- a/.collaboration +++ b/.collaboration @@ -1790,16 +1790,7 @@ }, { "ModuleName": "ServerCommand/任务发起流程前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:25:23.7494105+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\任务发起流程前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ProcessItem/新增任务流程", @@ -1951,17 +1942,7 @@ }, { "ModuleName": "PCPage/创建项目", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:24:00.7808284+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目流程页面\\创建项目.json", - "Pages\\项目\\项目流程页面\\创建项目.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommandPrivate/填充项目初始化数据", @@ -1985,16 +1966,7 @@ }, { "ModuleName": "ServerCommand/项目流程发起前校验", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-07-03T17:26:13.4953564+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\项目\\项目流程发起前校验.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/递归检测子任务", diff --git a/Pages/项目/项目流程页面/创建项目.json b/Pages/项目/项目流程页面/创建项目.json index 1bf261aa..d36ad0f0 100644 --- a/Pages/项目/项目流程页面/创建项目.json +++ b/Pages/项目/项目流程页面/创建项目.json @@ -395,7 +395,7 @@ "$type": "Forguncy.Model.StopCommand, ServerDesignerCommon" } ], - "ID": "3cfa8b74-4803-4069-b7ea-8d993e56437a" + "ID": "d641cb31-51c7-455b-93bf-6294692aab76" } ] } @@ -690,7 +690,7 @@ ] } ], - "ID": "edb9b4de-1eac-4a41-98d4-5863d75eb165" + "ID": "23dda704-c63d-4d55-87ae-5716a60a81e9" }, { "CommandList": [ @@ -703,12 +703,12 @@ } } ], - "ID": "961e22d3-87e7-47c8-a231-d11420156424" + "ID": "a1665037-614d-4f06-b9b6-d8180934bcb8" } ] } ], - "ID": "d3f1ac6a-ff5b-4e87-a7a1-f8d5ff850077" + "ID": "f16c0d1d-5214-4594-81cd-d728cffd09c5" }, { "CommandList": [ @@ -718,7 +718,7 @@ "Message": "请填写项目名称和项目简介" } ], - "ID": "69c67d7d-945a-4111-82aa-f4211904ebad" + "ID": "0452ddce-3a13-424d-8d60-2bfdd8258263" } ] } @@ -877,7 +877,7 @@ "MethodName": "ReloadBindingItems" } ], - "ID": "f22395c1-70ec-49e1-952a-8119a3eeb443" + "ID": "9a21da34-c367-4c07-ad2a-2f06b09450fb" } ] } @@ -1082,7 +1082,7 @@ ] } ], - "ID": "0f0637e4-a219-473f-8e90-fe07f1b1e169" + "ID": "1fab070d-80b0-484b-8cc5-22e8248b5a61" } ] } @@ -1657,6 +1657,7 @@ "step": 1, "precision": 1, "placeholder": "请输入", + "controls": false, "controlsPosition": true }, "DataValidationInfo": { @@ -1665,6 +1666,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(OR(INT(创建项目!P25)=0,创建项目!B25>0),1,0)" }, + "IgnoreBlank": false, "ErrorMessage": "开启严格模式下，预算工时必须大于0" } }, @@ -1695,15 +1697,15 @@ "min": 0, "step": 1, "precision": 1, - "placeholder": "请输入", + "placeholder": "0则不限制", + "controls": false, "controlsPosition": true }, "DataValidationInfo": { - "NumberType": 7, - "FirstParamValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=IF(OR(INT(创建项目!B25)=0,创建项目!I25>0),1,0)" - }, + "NumberType": 2, + "CompareParamType": 6, + "FirstParamValue": "0", + "IgnoreBlank": false, "ErrorMessage": "开启严格模式下，预算工时必须大于0" } }, @@ -2580,4 +2582,4 @@ "Formula": "创建项目!$B$39" } ] -}//xYy7n74z48OnO8ciPi7x1iP1ddHZMwMG1Fod5zBxJQbOzaMw1UHH6qInWr1BTou5i7fqmL1Zm/GOsIKwp0B0P7RTG+2OzjE0eLVerpVvHnPhDmTx82SdhEZ8WKxJNITBq2UCCQCoIjlaxhzm1lfB9g6oHnSspDWf5K2GeUEZ9poH6ST/pVB62vu8JtbhFP4q6PzIOt9MJ91ZF46KKhpYV1WlpwoGWecqSW3XofsURe8XwDzicDrh5ekpp3Xez3p6E0At7Ra+0QHqZpOENHN4FtYGXI5C0p2PfO8rCx+CFhPY5trNY5H2mgRV/s9W6aaO3SLlyMxiGvnPPy62zOlKhd7SeL4Ea1d3Ah0+dIGGLKih9PZnccGKipX9NwwUn6Z2FN+lfG2mZ/ES5a35vrZJDDBhjJbxQ4eBEkfNRxvaudYbd208kKPnW7hN333jQV5SFmiMKcskdGhPaK4v9/BwUzUzQooAOGupvME/R7g1n/uEYBa3MQJP4juNTmoLbIfxW6rxXd0/WmBeY3DJW7/z9pTNefyHQCv75VPqMG6hvNxjf/N5gzw0Vb3GdJcYzwmatkNMO9IXd3rLVrMMcy3IhFK4nebn1Mi1chnMfqDPtaMi5EukooYRP2V7nz8rVFzSzXbRAO4v1h6k6cE+mksUZTSV4g/+jcE9tvhez6hs3VCyyBkBN8cME4nSJnx7KpzRR8xlgIeKZ3ssUe9wbT67Hq2h35tH6JyVwaNDm0/chPs2+B80Xk5JWOSL3URzwxur6dyCRC9ZW8OkCPlzVbA2jauejC3q4TTWTGTOHa/RsLB3puw+Z3ehf6iPAyFMfP3DNZ2eFMS/eExL+0CvGeNkpKJaGNoGn6lE3kp3lz1dwFCuURcBhBnlvc9azs2gvoCjJVKWFJDeogtEMO0ldtchZA==|920 \ No newline at end of file +}//r8zwXOkFMuJeZaNyc+MoaT5xJYKVwXjHsLDhWwSFgwM/TMpqhMBsIVZ7Ey0SOWmoOEQdNnEMMC+jraAjIIiEsCrrWbTInOcChpprGBockAk1bPCpwEtvcZ19wT61Z93rJJN3GHjgLBtoIfmnn3+Yy0GB8iZab2AjUJ7ovFnHSJy3R/KDjxtqsWf6kAS7RuVPImLK+2z/7oyugl4KeYhBdWtnop8+FqTP++a37mCPwI1Xvmd2xxMYihykAmDVUaXlyra92b7fxsQtCnGkbwlaL6hRQxwWhs94rpp9DXuXHSLY+Z58hk7CtOrcCp6ggoywRc11le2Yo/mTO2sv9N15GMMTFryhK+kt/icRhxC0cRNQ+Z3HbTo1+JIhBcCgJSUMWC22GlYtTDDsXnVDY15FZv2H6CEe7zU8plHWr1s4+EJz3MUtoqnNmTLgFpvap135sYGsuD3gBJrUv7gastxIfBXVEduvS/NHzkOhzzREMASveFHqqRQ51THvGsUacxDx13BM27RPDXEoInxTOX6SCAd5ZVA4Y28AhtF7no7Xa1sgz5f4sDs+ZoAQmkUH3lFWskzsuHJyuOzRehWr8fntWw7YnI2lIL04e3yt5mhjVLS3s4zq0WbtLS6ccVPfyKxbbMrBfCGWL4WPT+3p/cA8IdkUDpE8+P8hRSgGmZPGdkzo8BqNkc2F1qEqdmn+eKsA1oxzvFLi1trQh35KqtrZMi0C6g1vGh/zyOt0SrOw9IrtR8+P2TvGH5m8c6QQYoY8YpCV6Mo5vP70FTE5wv0jpyE8eAbV2mfN/uRwg8ljd+SjdgIRMErPUc1q5dG9G9yQ54ypNlmwGDuCHKZvLujIas6y5qJGx6hqGF/qATPfObsh9pvjMRH08M0rFVu2YMY3GRVeNAbo+CbzrPDMpr/mbQ==|920 \ No newline at end of file diff --git a/ServerCommands/任务/任务发起流程前校验.json b/ServerCommands/任务/任务发起流程前校验.json index 7a785f99..0266399b 100644 --- a/ServerCommands/任务/任务发起流程前校验.json +++ b/ServerCommands/任务/任务发起流程前校验.json @@ -275,7 +275,7 @@ "Message": "请等待父任务审批后方可发起！" } ], - "ID": "c66244a0-0b2c-4d80-b302-9d8646e26876" + "ID": "c6e846b5-7a58-4aa4-9586-da098bcb80c8" } ] }, @@ -301,7 +301,7 @@ "Message": "当前项目未指定项目经理，请指定后再试" } ], - "ID": "bfa64f70-1f93-43cb-b795-c7d544722030" + "ID": "8a138cde-55be-4875-89a8-ece1875a779a" } ] }, @@ -327,7 +327,7 @@ "Message": "请指定任务负责人" } ], - "ID": "2f4170e1-257f-40c3-98a6-17323c4e8ea2" + "ID": "90b5051c-5cf5-486c-85cf-b24a9202a8bb" } ] }, @@ -353,7 +353,7 @@ "Message": "请指定任务类型" } ], - "ID": "5b83fd48-5d1e-4bdd-ac19-2b1dedb5776a" + "ID": "25a587e9-40ec-4674-ab47-3d1ca0fc54bd" } ] }, @@ -396,10 +396,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.项目可分配工时" }, - "ID": "0d5ac7332bf942d1998fe6e03c20481e" + "ID": "dce9e9bfa9454e68a44bc81b7559c096" } ], - "ID": "4661da29-6cba-4137-9ee1-3d33a08eadeb" + "ID": "3b0c61b7-4462-4f4d-9445-8aca9294039c" }, { "CommandList": [ @@ -410,10 +410,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=任务信息.父任务可分配工时" }, - "ID": "b1aff090a96e4e618b49838429706ff5" + "ID": "149f6070b4f94a4aa8f1b7106553337a" } ], - "ID": "88baa758-743d-49d3-9ee6-b0b22da513df" + "ID": "3c3ed4d6-f6bd-40e6-885f-6f0a2c4e09be" } ], "Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限" @@ -447,12 +447,42 @@ } } ], - "ID": "0a4e2697-1831-44b7-bfc4-f7a5439e046e" + "ID": "5653b3c9-2877-4aab-8d5a-255ea39acd1e" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务信息.任务预算工时" + } + }, + "value": "0", + "compareType": 5 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"开启严格模式下，任务预算工时不能为0\"" + } + } + ], + "ID": "0b140361-0f9d-4242-8475-e109b935c2a6" } ] } ], - "ID": "7ae391ca-88f5-424d-8756-636d8cd84c69" + "ID": "c0a5dc55-9938-449a-a6b4-4975853e25bb" } ], "Comments": "校验工时情况是否通过" diff --git a/ServerCommands/项目/项目流程发起前校验.json b/ServerCommands/项目/项目流程发起前校验.json index bb342758..27619614 100644 --- a/ServerCommands/项目/项目流程发起前校验.json +++ b/ServerCommands/项目/项目流程发起前校验.json @@ -340,7 +340,7 @@ "Message": "项目名称及代号不能为空" } ], - "ID": "67dc248f-a0f8-4993-98d1-76bbc52aab96" + "ID": "a2f6f6e4-af7c-42bf-872f-89d9c0629630" } ] }, @@ -366,7 +366,7 @@ "Message": "项目经理不能为空" } ], - "ID": "581984ca-729a-4b01-a938-7fb9705c656b" + "ID": "3ae7f08a-5d70-4ddb-8392-840b30a464f2" } ] }, @@ -408,7 +408,7 @@ "Message": "项目所属客户及部门不能为空" } ], - "ID": "65b1ae4d-df27-48b0-a56c-ab1c2e6ff668" + "ID": "af25a7e0-3a57-4f07-8950-5068351bc73d" } ] }, @@ -451,7 +451,7 @@ "Message": "项目计划日期不能为空" } ], - "ID": "39a702b1-bc56-45e1-94dc-6c3b4f916d48" + "ID": "74f6d5d5-d781-429b-bcd6-9a6bbf63bcc6" } ] }, @@ -460,40 +460,46 @@ "ConditionAndCommandPairList": [ { "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息.严格模式" - } - }, - "value": "1" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目信息.项目预算工时" - } - }, - "value": "%Null%" + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.严格模式" } - ] + }, + "value": "1" }, "CommandList": [ { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "严格模式下，预算工时必须提供" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目信息.项目预算工时" + } + }, + "value": "0", + "compareType": 5 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "严格模式下，预算工时必须提供" + } + ], + "ID": "34c30522-0706-4f83-8024-15554ffe9026" + } + ] } ], - "ID": "3c1c2e13-f6ae-4806-8d85-e0d95a256140" + "ID": "47a45adf-aeba-4d52-acda-a433a0ddabdd" } ] }, @@ -503,7 +509,7 @@ "Message": "校验通过" } ], - "ID": "3a297371-5af1-4b51-8c75-d72eea8b849f" + "ID": "f6c86803-2808-476b-aaeb-1fc93248089d" }, { "CommandList": [ @@ -513,7 +519,7 @@ "Message": "项目不存在" } ], - "ID": "64651437-a3cd-47cb-bf1c-05d173b6b205" + "ID": "f389064d-ab22-4766-b2a5-587190cf13e0" } ] }