{"Message":"优化工时的格式","MessageType":2,"Modules":[{"State":1,"Type":15,"Name":"ServerCommand/上报实际工时"},{"State":1,"Type":27,"Name":"ServerCommandPrivate/Base根据汇报模板生成内容"}],"Version":"v1"}

This commit is contained in:
cuckooent
2024-10-18 22:25:30 +08:00
parent 61c858d227
commit 8f19004262
3 changed files with 181 additions and 69 deletions

View File

@@ -1382,16 +1382,7 @@
},
{
"ModuleName": "ServerCommand/上报实际工时",
"State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-10-18T22:11:51.7093401+08:00",
"ModuleType": 15,
"ToRemoveFiles": [
"ServerCommands\\工时\\上报实际工时.json"
]
"ModuleType": 15
},
{
"ModuleName": "ServerCommands/客户",
@@ -2251,16 +2242,7 @@
},
{
"ModuleName": "ServerCommandPrivate/Base根据汇报模板生成内容",
"State": 1,
"LockedBy": {
"UserName": "cuckooent",
"Email": "phoben@qq.com"
},
"LockDateTime": "2024-10-18T22:08:29.5940271+08:00",
"ModuleType": 27,
"ToRemoveFiles": [
"ServerCommands\\汇报\\Base根据汇报模板生成内容.json"
]
"ModuleType": 27
},
{
"ModuleName": "ServerCommand/getEmployeeWorkHoursData",

View File

@@ -26,7 +26,7 @@
"DataValidationInfo": {
"IgnoreBlank": false
},
"TestData": "2"
"TestData": "45"
},
{
"Name": "开始日期",
@@ -40,26 +40,26 @@
"DataValidationInfo": {
"IgnoreBlank": false
},
"TestData": "2024-03-10"
"TestData": "2024-03-1"
},
{
"Name": "执行人",
"DataValidationInfo": {
"IgnoreBlank": false
},
"TestData": "administrator"
"TestData": "shamus"
},
{
"Name": "工时数",
"DataValidationInfo": {
"IgnoreBlank": false
},
"TestData": "40"
"TestData": "0"
},
{
"Name": "进展内容",
"DataValidationInfo": {},
"TestData": "测试"
"TestData": "测试\r\n2323\r\n333\r\n444"
},
{
"Name": "指定时薪单价",
@@ -455,7 +455,7 @@
"ID": "2d719d51ef5a46ee9aa64f113a34cce3"
}
],
"ID": "ca2be20e-caf9-4259-a881-eb9d9ee05128"
"ID": "9a37c2c6-2190-450d-ad57-35d2cf5261f3"
},
{
"CommandList": [
@@ -478,7 +478,7 @@
"ID": "11255bb1a556487e972cf64b9d1da58b"
}
],
"ID": "22d87b34-297e-4706-9a62-9937929c8616"
"ID": "60de0c6e-d57f-4a60-a259-0a43d3228324"
}
]
},
@@ -560,7 +560,7 @@
}
],
"Comments": "如果是分配到天,就检测当前日期该人员在任务里的计划工时是否够用",
"ID": "ab5146a6-7104-47f9-9418-3aaec485ad18"
"ID": "9d3af92c-4280-4b22-85ae-445d3d1ff44a"
},
{
"CommandList": [
@@ -574,13 +574,13 @@
"ID": "82c651b1c1424340b8c6b3ed1361b1fd"
}
],
"ID": "35f6bc72-4f94-4ea1-b401-c1040db84d5e"
"ID": "de361bdc-04f0-4f87-886f-be806c4090ae"
}
]
}
],
"Comments": "如果是按天分配,则需要检测这一天的实际工时是否超出,",
"ID": "5dbfff7c-3ce0-4620-8bfe-a918dc117540"
"ID": "606efb9f-8935-4558-b6dc-55462184a3df"
},
{
"CommandList": [
@@ -591,13 +591,143 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=计算本次分配工时"
},
"ID": "db70a34a0b184db296d7851c8b8a66ea"
"ID": "3f324a9712e14a6693472fa215c3143f"
}
],
"ID": "7d489aec-badf-4554-92c1-358fe436e9b0"
"ID": "a37dd95f-f863-4585-a9dc-c27b3167ce36"
}
]
},
{
"$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
"Operation": 17,
"OperationParamaterAName": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=CHAR(10)&CHAR(13)"
},
"OperationParamaterBName": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=进展内容"
},
"OutParamaterName": "进展内容拆分数组"
},
{
"$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
"OutParamaterName": "新内容数组"
},
{
"$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon",
"LoopInfo": {
"$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon",
"LoopCount": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=进展内容拆分数组"
},
"LoopItemParamName": "进展内容item"
},
"CommandList": [
{
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
"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": "=进展内容item"
}
},
"value": "[- ]-%",
"compareType": 14
},
{
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
"param": {
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=进展内容item"
}
},
"value": "%Null%",
"compareType": 1
}
]
},
"CommandList": [
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "新进展内容行",
"ParameterValue": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=进展内容item"
},
"ID": "cf8b8696e5de4c07a2decd0a96ecbd32"
}
],
"ID": "a94c2240-a723-4699-a52c-bf6f9465c72c"
},
{
"Condition": {
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
"param": {
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
"ParamObject": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=进展内容item"
}
},
"value": "%Null%",
"compareType": 1
},
"CommandList": [
{
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
"ParameterName": "新进展内容行",
"ParameterValue": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=\" - \"&进展内容item"
},
"ID": "c5ba4333eaa74383865c88f5fef78aba"
}
],
"ID": "323e841a-40a4-4712-8e3f-54fc50cf9902"
}
]
},
{
"$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
"InParamater": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=新内容数组"
},
"Operation": 4,
"OperationParamaterAName": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=新进展内容行"
},
"OutParamaterName": "新内容数组"
}
]
},
{
"$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit",
"InParamater": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=新内容数组"
},
"Operation": 16,
"OperationParamaterAName": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=CHAR(10)"
},
"OutParamaterName": "新内容"
},
{
"$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
"CommandList": [
@@ -611,7 +741,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "项目ID",
"GUID": "1a25cd29-2385-4eef-9c85-e83601add1af"
"GUID": "0f4e16c5-9bdc-4adc-a9de-fef475690b68"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -622,7 +752,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
"GUID": "14f07022-4810-482b-90ef-aa2844505af7"
"GUID": "a5934eea-82eb-49b8-b015-b6da1439a5df"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -633,7 +763,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时日期",
"GUID": "1ecc29d8-a245-4e59-8503-30a63fa50d38"
"GUID": "3fd626c5-ce88-4893-9ef4-e3270ed970e1"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -644,7 +774,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时类型",
"GUID": "b80ffd58-a019-4e7c-b644-9cf754764e1a"
"GUID": "6600c0a6-85e4-402f-85ae-c27d9cdf380a"
},
"Value": "实际"
},
@@ -652,7 +782,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
"GUID": "552fe044-d82a-45b6-939a-140c2fceb6e6"
"GUID": "68d08e51-3d2d-439b-bb51-d8d580eab964"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -663,18 +793,18 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行内容",
"GUID": "076f9520-d268-4763-ad07-83a49847c820"
"GUID": "912d6a22-9f2b-40ea-81a0-9b50f8528c26"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=进展内容"
"SerializeProperty": "=内容"
}
},
{
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时",
"GUID": "c114adc0-29e5-4c5c-8a05-8a701e2e292b"
"GUID": "51d2ceba-2831-4ca9-be9d-11614a741fb8"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -685,7 +815,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "上报工时",
"GUID": "9b0b0db9-ff38-440d-a56c-acdb3d991411"
"GUID": "b4ab089f-734d-4a7a-8907-007d1f984b2f"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -696,7 +826,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "时薪单价",
"GUID": "5b05a110-7ab8-4972-86d7-d93f4c73b1a5"
"GUID": "54418511-ce0f-460e-a0f7-bdc2047c5491"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -707,7 +837,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "提成系数",
"GUID": "81ed3896-b5d7-4fa9-819b-8d7a69a664e1"
"GUID": "aec753ae-d03d-48d7-9792-c3a61e5a8e6c"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -718,7 +848,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "时薪来源",
"GUID": "667e8ce5-7569-4ef1-8a28-85177d960221"
"GUID": "37c4bbac-d9a0-4c9c-b3d7-2a5c48d7a0fe"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -770,7 +900,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "项目ID",
"GUID": "6707d6cf-31e3-4263-938a-137162f84a28"
"GUID": "abdb8a3b-0224-46b4-87a7-bf23bd2eca8d"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -781,7 +911,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "任务ID",
"GUID": "410045d0-6630-4bd3-9ae9-58a32bc7e98a"
"GUID": "d125eaf0-d897-4221-9a3b-6788a7b69416"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -792,7 +922,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时日期",
"GUID": "e08f1b01-cf00-48c8-98ce-715b2b7f2d79"
"GUID": "78fd7bcb-f094-4e2b-96f2-7a1cbc343195"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -803,7 +933,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时类型",
"GUID": "c5ac7db7-32fc-4429-a992-c15b0f1a1a53"
"GUID": "85c19113-b8ea-4fda-bb10-176346c40738"
},
"Value": "计划"
},
@@ -811,7 +941,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行人",
"GUID": "08fc61cf-eb1d-4f4c-86ce-fb1f218eb833"
"GUID": "1c71172a-ca87-4122-b8a9-b0a2309364ce"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -822,7 +952,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行内容",
"GUID": "7fb1a4ef-fbff-4ab2-9c71-e8d2f4369567"
"GUID": "4a675b98-438d-4e63-b474-11c60ffbe600"
},
"Value": "系统自动生成对应计划,保证任务可分配工时"
},
@@ -830,7 +960,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时",
"GUID": "e50bab88-4c6d-485c-8a3e-c3a093ede920"
"GUID": "805ba35f-642a-4731-8104-e0b35188dc43"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -841,7 +971,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "上报工时",
"GUID": "06a765c1-1d51-460b-a355-013a6f0fa9f0"
"GUID": "c2825b07-08dc-4c7d-b91d-1e8f2fa05013"
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -852,7 +982,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "时薪单价",
"GUID": "8b6afbac-f260-4d84-b141-6caa5d2ee109"
"GUID": "a53fafaa-3b2b-4f2b-bd6d-29460279954c"
},
"Value": "0"
},
@@ -860,7 +990,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "提成系数",
"GUID": "87eb2640-6c8d-4a45-a34e-cd2fa765600e"
"GUID": "93933002-d8c4-40bb-9bfd-08c6983dafae"
},
"Value": "0"
},
@@ -868,7 +998,7 @@
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "时薪来源",
"GUID": "1f990909-947c-4a75-879d-620dd6c6d445"
"GUID": "f27ee3f0-a505-4722-92f8-0921f1cd2211"
}
}
],
@@ -876,7 +1006,7 @@
}
],
"Comments": "如果是分配到任务,就补一条计划,保证任务可分配工时准确",
"ID": "af532e11-792e-45ba-b0d6-a557b1433161"
"ID": "2b3bad5c-d3eb-433f-93ee-14750e95eee6"
}
],
"Disabled": true
@@ -902,7 +1032,7 @@
"ID": "dfe08a493a80498e8915bc2fe710ad21"
}
],
"ID": "05d59357-87f5-4b2a-8642-8e320d02f3fb"
"ID": "4d378d45-b835-41b2-b6e8-79d7e22e676b"
},
{
"CommandList": [
@@ -915,7 +1045,7 @@
}
}
],
"ID": "177680cb-5338-40bd-9209-072bea869714"
"ID": "dc414c94-a60b-44be-bf7b-b40857f672cb"
}
]
}
@@ -975,7 +1105,7 @@
"Message": "报工成功"
}
],
"ID": "1ba9f19c-c0ac-41c6-92be-1ce301bb5dd3"
"ID": "941aa2a7-b518-4d4b-99bb-6f9f3f667e15"
},
{
"CommandList": [
@@ -991,12 +1121,12 @@
}
}
],
"ID": "349e4918-17f3-4317-900b-04618a82c825"
"ID": "c710539a-b45e-44ab-9a1a-fb22c0f4a283"
}
]
}
],
"ID": "636b7e3a-fdc0-4eda-87af-5733e4d6dd53"
"ID": "522dc98d-68d6-4430-bba6-a578c285d43e"
},
{
"CommandList": [
@@ -1009,7 +1139,7 @@
}
}
],
"ID": "57c3f1f4-2b26-4d45-82ae-8bdd6ccb7fd9"
"ID": "11623524-397c-45bd-8304-8a12cd035e0f"
}
]
}

View File

@@ -231,7 +231,7 @@
"TableName": "任务工时表",
"BindingInfos": [
{
"GUID": "144a3c98-8ec5-456e-9882-a098061c5ee5",
"GUID": "9203757c-6d89-4aff-9165-de7715be5c5d",
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "执行内容",
@@ -240,7 +240,7 @@
"ColumnName": "工作内容"
},
{
"GUID": "fd802a36-a4e1-4bf5-9c68-d4578e543755",
"GUID": "b7013247-306f-4d80-a76b-524134edc2bb",
"BindingInfo": {
"TableName": "任务工时表",
"ColumnName": "工时",
@@ -302,7 +302,7 @@
},
"NullFormulaValueQueryPolicy": 0
},
"ID": "4e4e013022224189aaf5893ea887e547"
"ID": "7fb502d3bf0b4091ae91c8d28a695616"
},
{
"$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
@@ -468,7 +468,7 @@
]
}
],
"ID": "c3200006-a2c4-4982-b42f-e243171f9ad8"
"ID": "83b9b22c-4cc0-49a2-8fd1-400a5639ec5c"
},
{
"CommandList": [
@@ -489,12 +489,12 @@
]
}
],
"ID": "f7671178-8151-45e6-935e-bcef30e8de56"
"ID": "c03d9b60-65a0-4f53-8191-79cdd7f1fb5f"
}
]
}
],
"ID": "07d4985c-8707-4373-8fc0-5a53f2e992f4"
"ID": "7dac576b-8ab5-4065-804d-6200dd808b2d"
},
{
"CommandList": [
@@ -518,7 +518,7 @@
]
}
],
"ID": "65f4b2cb-254a-446b-bf87-8b7924351072"
"ID": "53152f15-8333-4fe4-883b-fc2739c301ee"
}
]
}