{"Message":"1. 完善任务新增、变更时的预算工时核验，对子任务类型做出判断；\r\n2. 修改汇报时的填报字段，去掉项目ID，由后端生成；","MessageType":2,"Modules":[{"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":15,"Name":"ServerCommand/修改任务预算工时"},{"State":1,"Type":15,"Name":"ServerCommand/新增任务"},{"State":1,"Type":1,"Name":"PCPage/首页"},{"State":3,"Type":23,"Name":"TableView/项目任务树视图"}],"Version":"v1"}
This commit is contained in:
SHAMUSPC\NINGMEI
@@ -56,6 +56,14 @@
|
||||
},
|
||||
"ColumnName": "项目ID"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "父任务ID",
|
||||
"GUID": "b3058106-27e3-4405-825a-c6317d65dbba"
|
||||
},
|
||||
"ColumnName": "父任务ID"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
@@ -87,7 +95,60 @@
|
||||
},
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "e249fcc1e8314d89994ed379114805fb"
|
||||
"ID": "2b57c3279a694782aa04fa8d1ecdb672"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "项目统计",
|
||||
"TableValue": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "e2c10b48-d276-43ff-92d3-6982554995d3",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "严格模式"
|
||||
}
|
||||
},
|
||||
"ColumnName": "严格模式"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目预算工时",
|
||||
"GUID": "df4b665e-bf05-415f-b1d6-44ef6268356f"
|
||||
},
|
||||
"ColumnName": "项目预算工时"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "已分配任务工时",
|
||||
"GUID": "e0b92957-2058-4acf-8f85-c8cb21e7751c"
|
||||
},
|
||||
"ColumnName": "已分配任务工时"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "a21318d5-5050-4baa-a025-483041bba932"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务表.项目ID"
|
||||
}
|
||||
},
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "4d7974b85a6845abbf13a6049e366122"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
|
||||
@@ -99,249 +160,235 @@
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务表"
|
||||
"SerializeProperty": "=项目统计.严格模式"
|
||||
}
|
||||
},
|
||||
"value": "%Null%",
|
||||
"compareType": 1
|
||||
"value": "1"
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "项目统计",
|
||||
"TableValue": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "8be465f9-1173-4551-ba9c-8077e9e1068a",
|
||||
"RelationBinding": {
|
||||
"RelatedTable": "项目表",
|
||||
"RelatedColumn": "ID",
|
||||
"DisplayColumn": "严格模式"
|
||||
"$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": "=任务表.父任务ID"
|
||||
}
|
||||
},
|
||||
"ColumnName": "严格模式"
|
||||
"value": "%Null%"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目预算工时",
|
||||
"GUID": "c3f88088-ff8f-4ba4-b4b8-0b9b680f51b1"
|
||||
},
|
||||
"ColumnName": "项目预算工时"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "已分配任务工时",
|
||||
"GUID": "239a7f3e-877a-4045-ba12-838408b52584"
|
||||
},
|
||||
"ColumnName": "已分配任务工时"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "View_项目统计信息",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "f6308398-2aec-4b4a-9e2a-ec524facb605"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务表.项目ID"
|
||||
}
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "预算工时上限",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目统计.项目预算工时-项目统计.已分配任务工时-任务表.任务预算工时"
|
||||
},
|
||||
"ID": "b20c1c796f94456fa4c385c315a4cdda"
|
||||
}
|
||||
],
|
||||
"ID": "52853e08-03e3-452c-a809-3fb79bd21885"
|
||||
},
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "66c3b6d4cc42478aaa57db9f14eade1e"
|
||||
{
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "父任务",
|
||||
"TableValue": {
|
||||
"TableName": "任务表",
|
||||
"TableValueType": 1,
|
||||
"BindingInfos": [
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "层级",
|
||||
"GUID": "71447dd9-ed15-40d3-8c95-35af02be1228"
|
||||
},
|
||||
"ColumnName": "层级"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "任务预算工时",
|
||||
"GUID": "f2ea1508-f30e-412f-a345-3ede9d6c420d"
|
||||
},
|
||||
"ColumnName": "任务预算工时"
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "总计划工时",
|
||||
"GUID": "1d7f0d26-c3c4-4fd5-9d35-d8c6775d2e75"
|
||||
},
|
||||
"ColumnName": "总计划工时"
|
||||
}
|
||||
],
|
||||
"SqlCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "ID",
|
||||
"GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务表.父任务ID"
|
||||
}
|
||||
},
|
||||
"NullFormulaValueQueryPolicy": 0,
|
||||
"TopCount": "1"
|
||||
},
|
||||
"ID": "aa8c47d4b5eb4239af91776e1e32a8cb"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
|
||||
"ParameterName": "预算工时上限",
|
||||
"ParameterValue": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=父任务.任务预算工时-父任务.总计划工时--任务表.任务预算工时"
|
||||
},
|
||||
"ID": "cb9ee25307d1485c8e3ac45336def641"
|
||||
}
|
||||
],
|
||||
"ID": "1e3945ac-3720-41d8-bcdf-ed397bcedcf8"
|
||||
}
|
||||
],
|
||||
"Comments": "严格模式下，根据是否有父任务来计算本次预算工时的上限"
|
||||
},
|
||||
{
|
||||
"$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": "=项目统计.严格模式"
|
||||
}
|
||||
},
|
||||
"value": "1"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=新预算工时"
|
||||
}
|
||||
},
|
||||
"value": "0",
|
||||
"compareType": 2
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目统计.已分配任务工时-任务表.任务预算工时+新预算工时"
|
||||
}
|
||||
},
|
||||
"value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=项目统计.项目预算工时"
|
||||
},
|
||||
"compareType": 2
|
||||
"$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
|
||||
"param": {
|
||||
"$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
|
||||
"ParamObject": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=预算工时上限"
|
||||
}
|
||||
]
|
||||
},
|
||||
"value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=新预算工时"
|
||||
},
|
||||
"compareType": 4
|
||||
},
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
|
||||
"ErrorCode": "400",
|
||||
"Message": "任务预算工时超标，请修改或申请新的预算。",
|
||||
"Message": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=IF(父任务ID>0,\"预算工时超标：父任务可只配计划工时不足，请修改后提交！\",\"预算工时超标：项目可只配计划工时不足，请修改后提交！\")"
|
||||
},
|
||||
"CustomReturns": [
|
||||
{
|
||||
"ReturnPropertyName": "新工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务表.任务预算工时"
|
||||
}
|
||||
"ReturnPropertyName": "新工时"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "5e2aa6a9-e408-44f0-90f1-e11fdb5270b7"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
|
||||
"TableName": "任务表",
|
||||
"ShowConfirm": false,
|
||||
"RowsToUpdate": 1,
|
||||
"RowsToUpdateCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "ID",
|
||||
"GUID": "36cde956-3506-4020-942d-ca6bb7016a8e"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务ID"
|
||||
}
|
||||
},
|
||||
"UpdateBindingValues": [
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "任务预算工时",
|
||||
"GUID": "b78102b7-bcdb-4145-a54e-46accc090b40"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=新预算工时"
|
||||
}
|
||||
}
|
||||
],
|
||||
"ParamNameToSaveNewRowValue": "新任务"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
|
||||
"TableName": "项目动态",
|
||||
"UpdateType": "add",
|
||||
"ShowConfirm": false,
|
||||
"UpdateBindingValues": [
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "3dfb20d5-c014-4d00-b1fd-f84951a03919"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务表.项目ID"
|
||||
}
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "项目动态",
|
||||
"GUID": "f026ebd2-95a1-4077-8e6c-e883138826b1"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时\""
|
||||
}
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "cd4d5d5b-62f7-4c11-916d-96c05c629d09"
|
||||
},
|
||||
"Value": "%CurrentUser%"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
|
||||
"ErrorCode": "0",
|
||||
"Message": "新增成功",
|
||||
"CustomReturns": [
|
||||
{
|
||||
"ReturnPropertyName": "新工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=新预算工时"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "c21c7ff8-478e-446d-af98-6e5ab1bd0d2d"
|
||||
}
|
||||
],
|
||||
"Comments": "如果任务设置了预算工时，则检测是否超标"
|
||||
}
|
||||
],
|
||||
"ID": "630ad741-4de8-48aa-8b47-71f462d8aa63"
|
||||
},
|
||||
{
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
|
||||
"ErrorCode": "400",
|
||||
"Message": "任务不存在",
|
||||
"CustomReturns": [
|
||||
{
|
||||
"ReturnPropertyName": "新工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务表.任务预算工时"
|
||||
}
|
||||
"ID": "c667d961-bb93-499b-9e03-482f4d1f115a"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"ID": "4258f225-dd00-46aa-a4b9-38208b689ff6"
|
||||
"ID": "275a2a65-0549-49f3-99d0-862677c550f5"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon",
|
||||
"CommandList": [
|
||||
{
|
||||
"$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
|
||||
"TableName": "任务表",
|
||||
"ShowConfirm": false,
|
||||
"RowsToUpdate": 1,
|
||||
"RowsToUpdateCondition": {
|
||||
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
|
||||
"ColumnBindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "ID",
|
||||
"GUID": "36cde956-3506-4020-942d-ca6bb7016a8e"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务ID"
|
||||
}
|
||||
},
|
||||
"UpdateBindingValues": [
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "任务表",
|
||||
"ColumnName": "任务预算工时",
|
||||
"GUID": "e283365a-ac2d-4c9e-90f5-92658dc5d899"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=新预算工时"
|
||||
}
|
||||
}
|
||||
],
|
||||
"ParamNameToSaveNewRowValue": "新任务"
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
|
||||
"TableName": "项目动态",
|
||||
"UpdateType": "add",
|
||||
"ShowConfirm": false,
|
||||
"UpdateBindingValues": [
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "项目ID",
|
||||
"GUID": "01da9d3d-946f-4118-8d88-5349a0502f34"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=任务表.项目ID"
|
||||
}
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "项目动态",
|
||||
"GUID": "d7d7c0ba-fafc-4c3d-90b5-da4cd5d222f9"
|
||||
},
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=\"调整了任务[\"&任务表.任务名称&\"]的预算工时\""
|
||||
}
|
||||
},
|
||||
{
|
||||
"BindingInfo": {
|
||||
"TableName": "项目动态",
|
||||
"ColumnName": "执行人",
|
||||
"GUID": "02e1aaae-adfd-4e74-936f-966d7d6bc110"
|
||||
},
|
||||
"Value": "%CurrentUser%"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
|
||||
"ErrorCode": "0",
|
||||
"Message": "新增成功",
|
||||
"CustomReturns": [
|
||||
{
|
||||
"ReturnPropertyName": "新工时",
|
||||
"Value": {
|
||||
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
|
||||
"SerializeProperty": "=新预算工时"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user