admin/clue
1
0
Fork 0
Code Pull Requests 1 Actions Activity

{"Message":"1. 增加项目、任务平行视图，解决子表成员的权限问题；\r\n2. 重新整理页面绑定，取消原表的统计字段；\r\n3. 优化任务、项目的人员管理；","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/项目任务分组"},{"State":1,"Type":7,"Name":"Table/任务成员表"},{"State":1,"Type":7,"Name":"Table/任务表"},{"State":1,"Type":7,"Name":"Table/任务进展"},{"State":1,"Type":7,"Name":"Table/任务评论表"},{"State":1,"Type":23,"Name":"TableView/View_任务工时统计"},{"State":1,"Type":7,"Name":"Table/任务工时表"},{"State":1,"Type":7,"Name":"Table/需求反馈登记表"},{"State":1,"Type":1,"Name":"PCPage/项目列表"},{"State":1,"Type":1,"Name":"PCPage/项目成员详情"},{"State":1,"Type":1,"Name":"PCPage/项目岗位详情"},{"State":1,"Type":1,"Name":"PCPage/任务列表"},{"State":1,"Type":1,"Name":"PCPage/项目甘特图"},{"State":1,"Type":1,"Name":"PCPage/项目成员"},{"State":1,"Type":1,"Name":"PCPage/项目岗位配置"},{"State":1,"Type":1,"Name":"PCPage/任务首页"},{"State":1,"Type":1,"Name":"PCPage/任务-侧栏"},{"State":1,"Type":1,"Name":"PCPage/任务-基本信息"},{"State":1,"Type":1,"Name":"PCPage/任务-子任务列表"},{"State":1,"Type":1,"Name":"PCPage/任务-工时"},{"State":1,"Type":1,"Name":"PCPage/工时详情"},{"State":1,"Type":1,"Name":"PCPage/新增任务"},{"State":4,"Type":1,"Name":"PCPage/参与成员管理"},{"State":2,"Type":1,"Name":"PCPage/任务成员详情"},{"State":1,"Type":1,"Name":"PCPage/修改报工"},{"State":1,"Type":1,"Name":"PCPage/新增报工"},{"State":1,"Type":1,"Name":"PCPage/分配计划工时"},{"State":1,"Type":15,"Name":"ServerCommand/变更任务状态"},{"State":1,"Type":15,"Name":"ServerCommand/修改任务预算工时"},{"State":1,"Type":15,"Name":"ServerCommand/移除任务成员"},{"State":2,"Type":15,"Name":"ServerCommand/更新任务参与人"},{"State":2,"Type":15,"Name":"ServerCommand/同步任务参与人字段"},{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":15,"Name":"ServerCommand/分配任务工时"},{"State":1,"Type":15,"Name":"ServerCommand/移除项目成员"},{"State":2,"Type":15,"Name":"ServerCommand/同步项目成员"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/后端新增项目反馈"},{"State":1,"Type":36,"Name":"ShareCommandContainer/打开任务详情"},{"State":1,"Type":9,"Name":"Theme"},{"State":1,"Type":40,"Name":"Plugin"},{"State":1,"Type":15,"Name":"ServerCommand/计算报工数据"},{"State":2,"Type":15,"Name":"ServerCommand/上报实际工时(备份)"},{"State":1,"Type":7,"Name":"Table/汇报状态"},{"State":1,"Type":7,"Name":"Table/EmojiTable"},{"State":1,"Type":15,"Name":"ServerCommand/任务发起流程前校验"},{"State":1,"Type":28,"Name":"ProcessItem/新增任务流程"},{"State":1,"Type":15,"Name":"ServerCommand/发起任务流程"},{"State":3,"Type":23,"Name":"TableView/项目平行视图"},{"State":3,"Type":6,"Name":"Pages/任务/任务成员"},{"State":3,"Type":23,"Name":"TableView/任务成员视图"},{"State":3,"Type":23,"Name":"TableView/任务平行视图"},{"State":3,"Type":6,"Name":"Pages/任务/任务类型管理"}],"Version":"v1"}

Browse Source
This commit is contained in:
超哥
2024-06-17 22:35:04 +08:00
parent 7eeca1dce9
commit 60ad662fb3
67 changed files with 4747 additions and 6886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
ServerCommands/工时/计算报工数据.json
View File

@@ -57,51 +57,51 @@
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "任务信息",
"TableValue": {
"TableName": "任务表",
"TableName": "任务平行视图",
"TableValueType": 1,
"BindingInfos": [
{
"GUID": "a4525178-4350-49a0-9b74-eafe7c58f7ad",
"GUID": "51d29667-c8fa-4ac7-9a80-84635b43c671",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "项目ID",
"GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3"
"GUID": "7a775562-0089-4f89-b487-adb6c325aae7"
},
"ColumnName": "项目ID"
},
{
"GUID": "28277e69-51c0-44d2-aaf4-8a64d47540f5",
"GUID": "1178509c-4606-4631-9f47-3ac0c387dd5c",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "任务名称",
"GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54"
"GUID": "82947834-93d4-4141-ae13-ac868718c9e3"
},
"ColumnName": "任务名称"
},
{
"GUID": "de559be7-424c-4c8c-a544-b9fe4a979b82",
"GUID": "595928d5-c5e2-4a0b-b9c5-1fb1b6994092",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "任务预算工时",
"GUID": "503e9dd2-fc8c-4426-a37f-c7d582c9577a"
"GUID": "9eadb3da-071f-490d-9a93-52bd6ab236c9"
},
"ColumnName": "任务预算工时"
},
{
"GUID": "f8e2c444-6df2-4419-bea1-e1964f5c417d",
"GUID": "39dd63aa-a9c6-4646-a0a1-d16bad89b4ce",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "任务状态",
"GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4"
"GUID": "8ab893d0-a983-49c5-83d4-f924307b44d8"
},
"ColumnName": "任务状态"
},
{
"GUID": "7b06a1fd-184e-4654-9737-ffcdb46fbf9c",
"GUID": "0f951348-a489-4498-b0df-c01a04a35554",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "任务状态",
"GUID": "da675aa2-3619-422b-817f-eed8c7c118c7",
"GUID": "7dd81639-004a-4e1f-8801-bdb573d4689f",
"RelationBinding": {
"RelatedTable": "任务状态",
"RelatedColumn": "状态码",
@@ -111,13 +111,13 @@
"ColumnName": "任务状态文本"
},
{
"GUID": "1251e695-ecf1-4bc6-96c1-141385475459",
"GUID": "b8d887d3-7e95-450e-8c41-55fe618bee11",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "项目ID",
"GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad",
"GUID": "e7c38242-5a9e-4a27-9f2e-e7310190db0e",
"RelationBinding": {
"RelatedTable": "项目表",
"RelatedTable": "项目平行视图",
"RelatedColumn": "ID",
"DisplayColumn": "严格模式"
}
@@ -125,13 +125,13 @@
"ColumnName": "严格模式"
},
{
"GUID": "ae8749c3-3c07-4bd6-9cda-3d6676493a35",
"GUID": "df02b131-76d0-4fc6-8c7d-4a2485886371",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "项目ID",
"GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7",
"GUID": "0c95b352-574d-479b-b97d-6216b400ee70",
"RelationBinding": {
"RelatedTable": "项目表",
"RelatedTable": "项目平行视图",
"RelatedColumn": "ID",
"DisplayColumn": "项目预算工时"
}
@@ -139,13 +139,13 @@
"ColumnName": "项目预算工时"
},
{
"GUID": "eff04df7-1d05-4aa8-8b4a-69bda7b01609",
"GUID": "518fccab-2ffd-47eb-a849-fc448c36ed5d",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "项目ID",
"GUID": "31040160-fc88-459c-b67b-8621acbc0920",
"GUID": "4bc603a4-f90b-4160-abf6-efd30574f3db",
"RelationBinding": {
"RelatedTable": "项目表",
"RelatedTable": "项目平行视图",
"RelatedColumn": "ID",
"DisplayColumn": "项目预算费用"
}
@@ -153,11 +153,25 @@
"ColumnName": "项目预算费用"
},
{
"GUID": "ddb0a421-4a62-4b26-b13f-dab5a964e89e",
"GUID": "b1e1ddce-0b10-4c9e-876b-8168a0b1827e",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "项目ID",
"GUID": "27e931f9-2c3b-4d36-9d31-f513387b9366",
"RelationBinding": {
"RelatedTable": "项目平行视图",
"RelatedColumn": "ID",
"DisplayColumn": "工时分配方式"
}
},
"ColumnName": "工时分配方式"
},
{
"GUID": "4b56bc02-6a36-44c9-861b-ef6f83ba1e51",
"BindingInfo": {
"TableName": "任务平行视图",
"ColumnName": "任务类型",
"GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296",
"GUID": "ccd2fb35-e336-4b95-a031-480e1b81d7e4",
"RelationBinding": {
"RelatedTable": "任务类型",
"RelatedColumn": "ID",
@@ -167,44 +181,30 @@
"ColumnName": "提成系数"
},
{
"GUID": "3c7ef327-7f18-4452-be72-a221854f6ba7",
"GUID": "74dfdd5f-cf5c-4a78-b999-d362ed94b09d",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "总计划工时",
"GUID": "4bdf7858-40b1-495e-be0d-109aaaf4f69f"
"GUID": "9b9f88c0-c367-46c7-948c-5b43579844d0"
},
"ColumnName": "总计划工时"
},
{
"GUID": "3d4e1b59-74f6-4c1f-ab7d-7885ee230e52",
"GUID": "561c6627-404a-4cd6-8110-221e757e6fde",
"BindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "总实际工时",
"GUID": "8505a216-3aee-4056-affe-6c760e35c844"
"GUID": "980d85ec-3b78-448b-b4de-3987fd4e4f28"
},
"ColumnName": "总实际工时"
},
{
"GUID": "6e41f3a4-30a4-4893-a08c-25fa63f7abf3",
"BindingInfo": {
"TableName": "任务表",
"ColumnName": "项目ID",
"GUID": "b5020b4b-8e2e-4b31-a2ac-53ca31b14b8e",
"RelationBinding": {
"RelatedTable": "项目表",
"RelatedColumn": "ID",
"DisplayColumn": "工时分配方式"
}
},
"ColumnName": "工时分配方式"
}
],
"SqlCondition": {
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
"TableName": "任务表",
"TableName": "任务平行视图",
"ColumnName": "ID",
"GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866"
"GUID": "9e13ce69-9a90-4903-b1bc-191e78046201"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -214,30 +214,30 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
"ID": "b58da3c8bfef4ca68be4a6994359c1e1"
"ID": "de7afa1d5ff1408fb92f64a23e648572"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "任务成员",
"TableValue": {
"TableName": "任务成员表",
"TableName": "任务成员视图",
"TableValueType": 1,
"BindingInfos": [
{
"GUID": "fe0babb8-290f-4984-98e8-b9b65fbec016",
"GUID": "95107486-9b29-4c73-8f89-62be80d0240d",
"BindingInfo": {
"TableName": "任务成员表",
"ColumnName": "参与人",
"GUID": "20d5971e-0ac3-4236-9e5f-0e67e2034b35"
"TableName": "任务成员视图",
"ColumnName": "任务成员",
"GUID": "c9f1bc1f-0740-4216-ac99-e79dd41fef88"
},
"ColumnName": "参与人"
},
{
"GUID": "6c6a6ff8-1d75-4169-b865-7dbb8bbcb47f",
"GUID": "6723495f-8637-4d58-bdb2-649aa4fb1d93",
"BindingInfo": {
"TableName": "任务成员表",
"ColumnName": "参与人",
"GUID": "671ec8a8-ebc7-42d3-8fda-f2686d841ead",
"TableName": "任务成员视图",
"ColumnName": "任务成员",
"GUID": "5f56fb6d-7c2e-4270-94c8-ab56bc9b6ae7",
"AttachType": {
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
"UserColumnAttachType": 1
@@ -246,11 +246,11 @@
"ColumnName": "参与人_全名"
},
{
"GUID": "631a0727-4b42-42b7-8d71-cb7dc03c5012",
"GUID": "27eded30-6e46-43a3-865e-519f92fcb92f",
"BindingInfo": {
"TableName": "任务成员表",
"ColumnName": "参与人",
"GUID": "b0fb9e47-ca43-45d0-bb54-cf7ac8edce15",
"TableName": "任务成员视图",
"ColumnName": "任务成员",
"GUID": "781a90fc-9c77-43ca-a831-8006774fd4da",
"AttachType": {
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
"UserColumnAttachType": 5,
@@ -260,44 +260,34 @@
"ColumnName": "参与人负荷"
},
{
"GUID": "7735fa98-f0e3-4055-81b9-14cc489d9d5a",
"GUID": "655461f1-c357-428f-990d-5cbb79baf4ed",
"BindingInfo": {
"TableName": "任务成员表",
"ColumnName": "项目成员ID",
"GUID": "ab7cb84d-53aa-4ef4-9480-9dcf6c0081a1",
"RelationBinding": {
"RelatedTable": "项目成员表",
"RelatedColumn": "ID",
"DisplayColumn": "默认时薪"
}
"TableName": "任务成员视图",
"ColumnName": "默认时薪",
"GUID": "4d44146b-7124-4f18-aa8d-17da23a4c0b3"
},
"ColumnName": "成员时薪"
},
{
"GUID": "627e2b07-d512-4f1e-8d76-321e226fa1f3",
"GUID": "8d8eef54-67cd-4ecd-beac-5635c6f5134e",
"BindingInfo": {
"TableName": "任务成员表",
"ColumnName": "项目成员ID",
"GUID": "5235f7aa-0a63-4bd3-8c41-f3a32d4c3a93",
"TableName": "任务成员视图",
"ColumnName": "岗位ID",
"GUID": "faf4cb38-75c8-4741-8b38-cefcb863754d",
"RelationBinding": {
"RelatedTable": "项目成员表",
"RelatedTable": "项目岗位",
"RelatedColumn": "ID",
"DisplayColumn": "岗位ID",
"NextRelationBinding": {
"RelatedTable": "项目岗位",
"RelatedColumn": "ID",
"DisplayColumn": "默认时薪"
}
"DisplayColumn": "默认时薪"
}
},
"ColumnName": "岗位时薪"
},
{
"GUID": "74144ece-f4d7-40c6-9f4c-c0370f7074a2",
"GUID": "3ccae4c3-7547-4909-8821-4bacc610fa9b",
"BindingInfo": {
"TableName": "任务成员表",
"ColumnName": "参与人",
"GUID": "b9b7cb37-08a6-4720-bddc-153de4068f89",
"TableName": "任务成员视图",
"ColumnName": "任务成员",
"GUID": "30da9fdf-e11e-4efe-94ec-0a98cc6fff27",
"AttachType": {
"$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess",
"UserColumnAttachType": 5,
@@ -313,9 +303,9 @@
{
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
"TableName": "任务成员表",
"TableName": "任务成员视图",
"ColumnName": "任务ID",
"GUID": "7d139430-ab2a-40df-98d0-38bc039435e2"
"GUID": "4cadf610-6894-4d43-a84b-ca682a8ebd1c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -325,9 +315,9 @@
{
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
"TableName": "任务成员表",
"ColumnName": "参与人",
"GUID": "2b46a973-8db3-40e7-b10b-93ddb666b812"
"TableName": "任务成员视图",
"ColumnName": "任务成员",
"GUID": "232ca578-e6be-4684-a198-81c16c892591"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -339,7 +329,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
"ID": "5aca1277f99d40a5b327a846fe0dde87"
"ID": "29b01c80875b4c53b56afeb8829c0df6"
},
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
@@ -372,7 +362,7 @@
"TableValueType": 1,
"BindingInfos": [
{
"GUID": "f1fd9018-3cc6-4910-883a-66e03bee6e48",
"GUID": "81cfbfdb-2497-4c80-8969-4d3a0e6a8e74",
"BindingInfo": {
"TableName": "项目成员表",
"ColumnName": "岗位ID",
@@ -386,7 +376,7 @@
"ColumnName": "项目岗位时薪"
},
{
"GUID": "113de3b5-551e-4d43-bfc6-ecd139d58ed5",
"GUID": "906b9a8e-10ce-4c3c-9d1b-55de074e0938",
"BindingInfo": {
"TableName": "项目成员表",
"ColumnName": "默认时薪",
@@ -427,7 +417,7 @@
"NullFormulaValueQueryPolicy": 0,
"TopCount": "1"
},
"ID": "919180f493fd46d4927d25dc48fa0e16"
"ID": "17f1d03afb8745f49c7c4bb15b1cb482"
},
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
@@ -497,7 +487,7 @@
}
],
"Comments": "项目成员设置的时薪",
"ID": "196360f2-7520-4373-a5c6-569e78ef6607"
"ID": "c9ed015e-b153-4a1e-90f9-f2b77fd41e7f"
},
{
"Condition": {
@@ -530,7 +520,7 @@
}
],
"Comments": "项目岗位设置的时薪",
"ID": "a6e9b625-8a97-483d-8ddb-5ac946126350"
"ID": "02ae84f0-3eff-43e7-a7a6-3e2edc3780f9"
},
{
"Condition": {
@@ -563,7 +553,7 @@
}
],
"Comments": "成员用户的默认时薪",
"ID": "07c39884-8926-4a0b-acb4-eb8832e8c1ba"
"ID": "31512194-2720-46c4-a700-bc507e1e321c"
},
{
"CommandList": [
@@ -580,13 +570,13 @@
"ID": "eb0ba1839ebc4ec58750e971080fc72b"
}
],
"ID": "3e5fdd55-d865-4147-9294-996b4c6ad1f1"
"ID": "60c0485a-c34d-4729-af35-6c8a1ba45269"
}
]
}
],
"Comments": "优先使用手动指定的提成金额",
"ID": "03a5ef08-ca90-48dd-a97b-497445585504"
"ID": "d12bb755-e110-459f-b338-04f09e322ecd"
},
{
"CommandList": [
@@ -606,7 +596,7 @@
"ID": "2eafc4d65af44d18adfcd21c68734df8"
}
],
"ID": "bfd527d9-f865-4d28-8f53-d0597bc99bf7"
"ID": "71c0233d-4246-4440-84ac-e996ce1ad688"
}
],
"Comments": "计算成员的时薪"
@@ -757,13 +747,13 @@
}
],
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
"ID": "ba878135-8e02-406f-af6b-cccb447eca45"
"ID": "347f6c15-2879-4049-9c22-9b1fe9ac797d"
}
]
}
],
"Comments": "如果分配到人头，则判断该人总计划工时还够不够",
"ID": "32052fab-784c-419e-86dd-1f40cb25407d"
"ID": "4189a1c9-c394-4568-a101-a494d9410881"
},
{
"Condition": {
@@ -875,13 +865,13 @@
}
],
"Comments": "先检查个人工时余额够不够，如果不够，直接提成为0",
"ID": "6a83bcdf-756e-4c92-b42e-d0e32495a504"
"ID": "0b981156-3a4e-4de7-930e-a6822be0525a"
}
]
}
],
"Comments": "如果是共用任务工时，则查看任务计划工时够不够",
"ID": "13321a98-7059-4cc4-b1cd-3609329f079c"
"ID": "fcfde3f5-0254-416d-8ddd-0a3ab08323dc"
}
]
},
@@ -1014,7 +1004,7 @@
]
}
],
"ID": "b029ab62-2ed4-450b-93da-1aa7e32aeb5a"
"ID": "935dd64c-f2b8-4028-8f0f-ce63ef2489cc"
},
{
"CommandList": [
@@ -1075,13 +1065,13 @@
]
}
],
"ID": "f5618930-6c00-45a7-96d2-66a48f878063"
"ID": "bc661f54-29f0-4057-8a35-2ab125f2de75"
}
]
}
],
"Comments": "如果提交的工时类型等于项目工时的核定方式且开启严格模式就校验本次有没有超标",
"ID": "4435ea5c-76f7-4074-9a3f-67efdeaa7958"
"ID": "2feed033-ba7d-4f12-ab19-6291a2e35524"
},
{
"CommandList": [
@@ -1138,12 +1128,12 @@
]
}
],
"ID": "805cb12e-065e-49a6-bd5a-2f2581c3458f"
"ID": "4d2d8bc6-9ed2-4de0-b162-702afb3d01cf"
}
]
}
],
"ID": "412221e1-a820-4a0b-963a-d57a9b3ffa10"
"ID": "1c07d0f0-a59d-472c-856b-77b65143d27b"
},
{
"CommandList": [
@@ -1176,7 +1166,7 @@
]
}
],
"ID": "5ec5ed41-9521-4a99-8f5a-cbe9da2543fb"
"ID": "b59cbb75-8ff9-4413-8ecd-2886d5a1e03c"
}
]
}