diff --git a/.collaboration b/.collaboration index 2d640a8c..6e97021f 100644 --- a/.collaboration +++ b/.collaboration @@ -2442,17 +2442,7 @@ }, { "ModuleName": "PCPage/统计首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-17T12:50:00.6318445+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\统计\\统计首页.json", - "Pages\\统计\\统计首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/统计", @@ -2480,36 +2470,14 @@ }, { "ModuleName": "RdlReport/人员工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-17T10:24:11.5390212+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\人员工时报表.json", - "Reports\\人员工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/客户工时报表", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-17T12:50:00.6316251+08:00", "ModuleType": 18 }, { "ModuleName": "RdlReport/项目工时报表", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-17T13:46:20.0004267+08:00", "ModuleType": 18 } ] \ No newline at end of file diff --git a/Pages/统计/统计首页.json b/Pages/统计/统计首页.json index 5bfe7e9a..5873f3b8 100644 --- a/Pages/统计/统计首页.json +++ b/Pages/统计/统计首页.json @@ -318,13 +318,6 @@ "Count": 43, "DefaultSize": 32.0 }, - "Values": { - "1,7": "项目", - "1,18": "成员", - "1,39": "打开报表", - "3,7": "版本", - "3,18": "日期" - }, "AttachInfos": { "0,0": { "CellType": { @@ -350,49 +343,61 @@ "CommandList": [ { "$type": "Forguncy.Model.OpenActiveReportCommand, ServerDesignerCommon", - "SessionGuid": "9d79fc94-b1fd-4ede-86ed-8516a9bc44a5", + "SessionGuid": "ff1cbba5-a121-4a67-a096-87b0fb7c3e1b", "OpenReportName": "人员工时报表", - "PassParameters": [ - { - "TargetParameter": "开始日期", - "SourceValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!开始日期" - } - }, - { - "TargetParameter": "结束日期", - "SourceValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!结束日期" - } - }, - { - "TargetParameter": "项目ID", - "SourceValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!J2" - } - }, - { - "TargetParameter": "版本ID", - "SourceValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!J4" - } - }, - { - "TargetParameter": "执行人数组", - "SourceValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!U2" - } - } - ], + "SideBarPosition": 2, "OpenReportTitle": "人员工时详情报表" } ], - "ID": "ff99d15d-4828-4c59-867f-33b30ba2a8e9" + "ID": "99885c4e-bfd9-43e3-918a-0e5b349ba0b7" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=值" + } + ] + }, + "value": "客户工时报表" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OpenActiveReportCommand, ServerDesignerCommon", + "SessionGuid": "8fe7b695-bd88-464d-a655-6b80e5a2ea90", + "OpenReportName": "客户工时报表", + "SideBarPosition": 2, + "OpenReportTitle": "人员工时详情报表" + } + ], + "ID": "32835437-2b31-4c48-83b6-94941fb2842d" + }, + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=值" + } + ] + }, + "value": "项目工时报表" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OpenActiveReportCommand, ServerDesignerCommon", + "SessionGuid": "487a8a9d-a65f-43da-8cc0-95bfdd1e83ca", + "OpenReportName": "项目工时报表", + "SideBarPosition": 2, + "OpenReportTitle": "人员工时详情报表" + } + ], + "ID": "7a721f29-9df0-4215-b4c2-d6c1c7475adf" } ] } @@ -427,13 +432,6 @@ "FGC_LoginUser" ] }, - { - "value": "任务工时报表", - "label": "任务工时报表", - "CanVisitRoleList": [ - "FGC_LoginUser" - ] - }, { "value": "人员工时报表", "label": "人员工时报表", @@ -459,15 +457,8 @@ "expend": true, "children": [ { - "value": "工作量报表", - "label": "工作量报表", - "CanVisitRoleList": [ - "FGC_LoginUser" - ] - }, - { - "value": "反馈报表", - "label": "反馈报表", + "value": "客户工时报表", + "label": "客户工时报表", "CanVisitRoleList": [ "FGC_LoginUser" ] @@ -485,317 +476,7 @@ "activeTextColor": "Accent 1" } }, - "1,9": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目表", - "BindingInfos": [ - { - "GUID": "c439d303-fcbe-4a63-9440-6557254ad768", - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "40fb3e5f-64f4-4833-8a3c-ed331babd482" - }, - "ColumnName": "value" - }, - { - "GUID": "111f4ad2-ee50-4142-b38a-45df9ffa488e", - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "48b4d0e4-6f31-4195-9adf-e37b625163dd" - }, - "ColumnName": "label" - } - ], - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "multiple": true, - "collapseTags": true, - "filterable": true, - "filterInServerOptions": { - "defaultMaxOptionsCount": 10, - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true - } - }, - "1,20": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", - "BindingInfos": [ - { - "GUID": "2fb67ffc-ff4b-4f9f-8aff-69bb4158b375", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "7d0ea843-9812-4cd0-ac07-552430e0eb65" - }, - "ColumnName": "value" - }, - { - "GUID": "72dd4b1c-2db0-4698-b1b5-8e7eefc76991", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "75dcabd8-8331-4b5d-8ee3-495478413215" - }, - "ColumnName": "label" - } - ], - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "multiple": true, - "collapseTags": true, - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true - } - }, - "1,39": { - "CellType": { - "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", - "Text": "打开报表", - "TemplateKey": "_RS_Main1" - } - }, - "3,9": { - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "useBinding": true, - "options": [ - { - "value": "黄金糕", - "label": "黄金糕" - }, - { - "value": "双皮奶", - "label": "双皮奶" - }, - { - "value": "蚵仔煎", - "label": "蚵仔煎" - }, - { - "value": "龙须面", - "label": "龙须面" - }, - { - "value": "北京烤鸭", - "label": "北京烤鸭" - } - ], - "bindingOptions": { - "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "项目版本", - "BindingInfos": [ - { - "GUID": "730228ca-6c80-4199-9151-fe154ccfc7b6", - "BindingInfo": { - "TableName": "项目版本", - "ColumnName": "ID", - "GUID": "f4cfecd6-6a0a-437a-b1f5-03fb4beb4755" - }, - "ColumnName": "value" - }, - { - "GUID": "4dc108ce-fae9-4b37-ad00-5fec483e74a4", - "BindingInfo": { - "TableName": "项目版本", - "ColumnName": "名称加版本号", - "GUID": "d09043bd-3df4-4d92-8ce6-2cc953574075" - }, - "ColumnName": "label" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目版本", - "ColumnName": "项目ID", - "GUID": "10e6c191-91d0-47cf-836e-f9f111b80d79" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!H2" - } - }, - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据", - "clearable": true - } - }, - "3,20": { - "CellType": { - "$type": "ElementUI.DatePickerCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!U4" - }, - "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "GetSelectedRange", - "RetrunParamNames": { - "StartValue": { - "SerializeProperty": "=统计首页!开始日期" - }, - "EndValue": { - "SerializeProperty": "=统计首页!结束日期" - } - } - } - ], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "DefaultValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=EOMONTH(TODAY(),-1)+1&\",\"&EOMONTH(TODAY(),0)" - }, - "type": "daterange", - "placeholder": "请选择", - "startPlaceholder": "开始日期", - "rangeSeparator": "至", - "endPlaceholder": "结束日期", - "format": "yyyy年MM月DD日", - "firstDayOfWeek": 1, - "clearable": true, - "DefautWeekFormat": "yyyy 第 WW 周" - } - }, - "5,7": { + "1,7": { "CellType": { "$type": "TabManager.TabCellType, TabManager", "TemplateKey": "_RS_NewFashionStyle1" @@ -811,11 +492,6 @@ "FontFamily": 1, "FontSize": 13.333333333333332 }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Formatter": 2 - }, { "FontSize": 13.333333333333332 } @@ -823,8 +499,7 @@ "Types": { "Strs": [ "Background 2 0", - "Body", - "[AUTO]General" + "Body" ], "Borders": [ { @@ -836,91 +511,10 @@ "0,5": 0, "1,5": 0, "1,7": 1, - "1,8": 1, - "1,9": 1, - "1,18": 1, - "1,19": 1, - "1,20": 1, - "1,38": 1, "2,5": 0, - "2,7": 1, - "2,8": 1, - "2,9": 1, - "2,10": 1, - "2,11": 1, - "2,12": 1, - "2,13": 1, - "2,14": 1, - "2,15": 1, - "2,16": 1, - "2,17": 1, - "2,18": 1, - "2,19": 1, - "2,20": 1, - "2,21": 1, - "2,22": 1, - "2,23": 1, - "2,24": 1, - "2,25": 1, - "2,28": 1, - "2,29": 1, - "2,30": 1, - "2,31": 1, - "2,32": 1, - "2,33": 1, - "2,34": 1, - "2,35": 1, - "2,36": 1, - "2,37": 1, - "2,38": 1, - "2,39": 2, - "2,40": 2, - "2,41": 1, - "2,42": 1, "3,5": 0, - "3,7": 1, - "3,8": 1, - "3,9": 1, - "3,10": 1, - "3,11": 1, - "3,12": 1, - "3,13": 1, - "3,14": 1, - "3,15": 1, - "3,16": 1, - "3,18": 2, - "3,19": 1, - "3,20": 1, - "3,21": 1, - "3,22": 1, - "3,23": 1, - "3,24": 1, - "3,25": 1, - "3,26": 1, - "3,27": 1, - "3,28": 1, - "3,29": 1, - "3,30": 1, - "3,31": 1, - "3,32": 1, - "3,33": 1, - "3,34": 1, - "3,35": 1, - "3,36": 1, - "3,37": 1, - "3,38": 1, - "3,39": 2, - "3,40": 2, - "3,41": 1, - "3,42": 1, "4,5": 0, - "4,38": 1, - "4,39": 1, - "4,40": 1, - "4,41": 1, - "4,42": 1, "5,5": 0, - "5,7": 1, "6,5": 0, "7,5": 0, "8,5": 0, @@ -967,42 +561,42 @@ "23,42": 1 }, "ColStyles": { - "7": 3, - "8": 3, - "9": 3, - "10": 3, - "11": 3, - "12": 3, - "13": 3, - "14": 3, - "15": 3, - "16": 3, - "17": 3, - "18": 3, - "19": 3, - "20": 3, - "21": 3, - "22": 3, - "23": 3, - "24": 3, - "25": 3, - "26": 3, - "27": 3, - "28": 3, - "29": 3, - "30": 3, - "31": 3, - "32": 3, - "33": 3, - "34": 3, - "35": 3, - "36": 3, - "37": 3, - "38": 3, - "39": 3, - "40": 3, - "41": 3, - "42": 3 + "7": 2, + "8": 2, + "9": 2, + "10": 2, + "11": 2, + "12": 2, + "13": 2, + "14": 2, + "15": 2, + "16": 2, + "17": 2, + "18": 2, + "19": 2, + "20": 2, + "21": 2, + "22": 2, + "23": 2, + "24": 2, + "25": 2, + "26": 2, + "27": 2, + "28": 2, + "29": 2, + "30": 2, + "31": 2, + "32": 2, + "33": 2, + "34": 2, + "35": 2, + "36": 2, + "37": 2, + "38": 2, + "39": 2, + "40": 2, + "41": 2, + "42": 2 }, "SheetStyle": { "FontFamily": 1 @@ -1010,18 +604,9 @@ }, "Spans": [ "0,0,23,5", - "5,7,18,36", - "1,39,1,3", "23,7,1,5", "23,12,1,6", - "3,18,1,2", - "3,20,1,18", - "3,7,1,2", - "3,9,1,8", - "1,7,1,2", - "1,9,1,8", - "1,18,1,2", - "1,20,1,18" + "1,7,22,36" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1064,4 +649,4 @@ "Formula": "统计首页!$M$24" } ] -}//pYJ5eU/m4ikvqlWRmND495Dt5uJ3e9qycWabOptcVFTaEyZtzJv16AZpURtJqBl+wDR5WiJKZA/9hbUjpMXcDjqqP7N3t+EGa+6OX/cpSppihUBx3WNG8ZWtrHmzdhze6mszLoNOBTIAYSyOb+Oghbm8A0Zq9gHDfzIfcXNEMyshxbLQQBMaozWIKrNBwMKZsJZIPb4q/CQVHiY+q7Fu/PRUrzZUkDqtah/Fh6gsSolk8WxqCGdTIkoAzgpC5wTpL65XpbJzMSYnOA64wf3W8PJRT//J2xASL3dz175ePrCg+Y+rCSj+cvo1vE5lGnEeYXcPJgYcOF9XEaOikVjumpzvVj+XeroRxWdNUcWuwZVVwWBcw7VQEj7moqo54lmTnm4PpdQlcHu2k9xW0eF/OOAP1RxqmrSIgAg6vEmub+yx9vBCJ5FZgDXyds5kUw++suEeGZjlAe5pO49qpMjA/chFDmPWdVlG71UZ5B5fyK2T5hcB+O0LWOcupvn7MpnEyxpyuCixz9Sb9rt3zKoiilt1jHW3kra6bFczech2mz7YLh2VxmcTdeNJQvHiAUh54OnGGshX7mOhsZvW+kK4jCg/sukKs3D94CJAjBKm10pkjDnO82/Jy8bO4Ej3e6aMuC+8bblCuQhpMLk9APnj3QF1NGjlJF443Grsi+u2XR4IXHHfhGcPNyqd2L8rgovf6C8LMa7Hc73zRid+5gshOnjW7CWOZRR2jNkGqst6vQQSfcaw9heCwVm0tMDDNi/aq5F7B8ze7WMeiSdinmBVx5N28DPX7AN5v+5ZL4ZR+eZ9sc/EiZxuJ1yxMe9g/UU5WcWc2A2gwkPWJNpAO1Nq/eglGliOh61JiQt9vCBvSNtLSPSf4MUVWOSNSmkSrdB0q0efNki+ODE7l5Kspse/+w==|920 \ No newline at end of file +}//n1LsgywkHHzmUMX0qjegqB+N3hgbK/7phAI3gyyfzfxlX7TgfzxOSe3DHLyp5zW5/6YeLX1k6Yr9CALYhcsCATVqPBAOIxZ1odfaou5D1quAkux376BDFwB58QPARefPR6YtTNLiHjqDeDiw7ipCUcyixU6IrGOM7iRu8Yr/6rgnuDMqTR8qYvMPDCMdEqQjkX7bmz+7HFOEvBm+2zSgd3NtdIxb/xdIai0pOhyJFhxQ8H7yP5oNeBrMZEjkZCDHlPQ+KAcIP490rXmcy8Y/dD36JWYqClAOQ5NJKlsGx2H4syVRTtZGZcINS/Ei/7aTpqRA3/cpztzkbqCd4QbGQqLVCia9qvvp4zAkr8xoUxyc7on3FuYnq1BWete7Chle1UmdhmonG25WMPEKeCUxwNkvzwbwYt9VInrdIFo74hpo0gaCMBq1uvADy1XVeqiiLTgqX/NnHog1gjsdJ0d9cpOx9DlZogGmw3VQaoxFJ5bmcS+arnxhLmD2lxrwfm60HNA/lH4B+bSUpyQuLwRG1L5ZseN7rtCsfUP0HwxTeEiY1ryRYZQOeeRuMrdJYxbM/h5dJHiaw+4EjbcP195hQTW34cs75ij2HxsDKBQYTli47x6x6pbKxLFUtqsetZngz/Lfa8y1GdsLHvE/i1NGM2fdWbHIUUFCQA+nIl7I49doFm4cli+5z+brDGWRedVF+rph9JU2emn+KFEA8afE+GN5H+6vffalalyyp6sEDhWMZPOAYHdM1xkYpg70EfryJE17MUcDXA+7K2hF1mRhQI9I0vEuesNuTQgnB38OYWUqZc8+F2oM4MamQ4P92QKW5MAEnK8NxFYbK0rl2EBUGL3KarUrfXOZyHxtOJAesevXUcV6xyl8SxmZSms2vrcRpUtDtXF6AKpiHzEEdgqUqA==|920 \ No newline at end of file diff --git a/Reports/人员工时报表.json b/Reports/人员工时报表.json index 795828a1..108b26b5 100644 --- a/Reports/人员工时报表.json +++ b/Reports/人员工时报表.json @@ -8,7 +8,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "2cc7ad7a-32a0-4eba-a169-22acc6d417d0", + "GUID": "37d76f01-2270-46b1-96ca-9eaeacd040f0", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", @@ -17,7 +17,7 @@ "ColumnName": "日期" }, { - "GUID": "b6a9ac13-f35a-425d-ba99-75fa3b4c5259", + "GUID": "6d5d94e1-46f5-43ae-b33a-286f8ea2a042", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -30,7 +30,16 @@ "ColumnName": "执行人" }, { - "GUID": "2752e70e-b3ec-48b0-8668-e8ab46709b00", + "GUID": "74776e95-9333-4c56-a8f0-cb4aa9db2be1", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "18822f72-2b6c-4069-90a9-42f965273618" + }, + "ColumnName": "执行人用户名" + }, + { + "GUID": "df69338f-6a40-4b9a-b58d-bf7fbab2bc32", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", @@ -39,7 +48,7 @@ "ColumnName": "项目ID" }, { - "GUID": "6b2843b9-aae7-4217-b424-f48f89a010a1", + "GUID": "5b78544e-5b61-48c3-b73e-32756b6f5a9a", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", @@ -53,7 +62,7 @@ "ColumnName": "项目" }, { - "GUID": "6c7f269f-a22b-4145-aa5f-ff3d0b03e6e0", + "GUID": "6ae1d98d-6967-4767-a3fa-56960df3c1ff", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -67,7 +76,7 @@ "ColumnName": "版本ID" }, { - "GUID": "9377cfa8-fad7-4504-a482-6d17b61f916b", + "GUID": "a9b23355-a4d5-43cd-a408-7d50a048213b", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -86,7 +95,16 @@ "ColumnName": "版本" }, { - "GUID": "5199bec2-64ba-4aad-800d-f9d2d7ffc583", + "GUID": "6fc900d0-7809-4cc4-87ef-e87854a274a7", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "3a2ff136-5a7f-42bc-81da-a071c0371ee8" + }, + "ColumnName": "任务ID" + }, + { + "GUID": "2f79211a-5928-42d4-b974-102db51a4ac8", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -100,114 +118,33 @@ "ColumnName": "任务" }, { - "GUID": "d986b9e7-0152-4510-be6e-a76a3a448708", + "GUID": "ad0411bb-9a38-46ec-b6a9-bf9f5b69a6d2", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "执行内容", - "GUID": "a05b2b99-305e-457a-aea5-33a862bd3fc6" + "ColumnName": "总上报工时", + "GUID": "12849999-d7d4-47d7-94ec-5cd5a49d649f" }, - "ColumnName": "执行内容" + "ColumnName": "总上报工时" }, { - "GUID": "0f4e50ce-b137-4efa-b9ed-abd53ad923a5", + "GUID": "4f497231-8e85-4835-ae05-89634c586e52", "BindingInfo": { "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "65e0ccab-4af0-4ba9-a36a-eda6a070610d" + "ColumnName": "总核定工时", + "GUID": "16475046-8a23-461c-b370-f02bdbc1af8a" }, - "ColumnName": "计划工时" - }, - { - "GUID": "038b76d4-5990-427c-a7e7-a65376ba5859", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "上报工时", - "GUID": "e10f795f-d132-40d2-ace9-07ac13514d9a" - }, - "ColumnName": "上报工时" - }, - { - "GUID": "74d72ac1-0373-4a66-9e25-846cd05d10d1", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "核定工时", - "GUID": "63fb43f0-95af-4e84-9d66-2243e248a524" - }, - "ColumnName": "核定工时" + "ColumnName": "总核定工时" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 3, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "810f6154-fc71-43e5-ae59-86ad464bef04" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=开始日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "CompareType": 5, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "097ea6bc-cf6e-4af0-9454-6cb766129b8e" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=结束日期" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "ae0f2281-c1ec-406f-aa19-e03868c8d159" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "039ef573-57ab-4305-81e6-27d96de05aae", - "RelationBinding": { - "RelatedTable": "任务平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "版本" - } - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=版本ID" - } - }, - { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 8, - "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "a01525e0-5b16-400d-9933-3af5d8230939" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=执行人数组" - } - } - ] + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 2, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "03e6fec5-18c0-488d-9823-297696ccc1ac" + }, + "Value": "0" }, "OrderBySqlCondition": { "OrderByColumns": [ @@ -225,13 +162,13 @@ "ColumnsType": [ "date-time", "string", + "string", + "integer", + "string", "integer", "string", "integer", "string", - "string", - "string", - "number", "number", "number" ] diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx index 70ff9e57..8cc109b9 100644 --- a/Reports/人员工时报表.rdlx +++ b/Reports/人员工时报表.rdlx @@ -1 +1,4 @@ -人员工时报表.rdlx5.25cm0cm0cm39.501cm5.25cm工时表_DataSetAuto
true1.5cm7true人员工时详情表0.75cmtrue文本框1项目true文本框2任务true文本框12版本true文本框25执行内容true文本框13计划工时true文本框17上报工时true文本框21核定工时
0.75cmtrue项目=Fields.Item("项目").Valuetrue任务=Fields.Item("任务").Valuetrue版本=Fields.Item("版本").Valuetrue=Fields.Item("执行内容").Valuetrue计划工时=Fields.Item("计划工时").Valuetrue上报工时=Fields.Item("上报工时").Valuetrue核定工时=Fields.Item("核定工时").Value
0.75cmtruetruetruetrue合计true=Sum(Fields.Item("计划工时").Value)true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
7.499cm6.5cm4.498cm10.502cm3.5cm3.5cm3.502cm
true0.75cm7true=((Fields.Item("执行人").Value & "：") & Round(Sum(Fields.Item("上报工时").Value), 1)) & "小时"
0.75cmtruetruetruetruetrue=Sum(Fields.Item("计划工时").Value)true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
=Fields.Item("执行人").Value
1cm1cm29.7cm42cm1cm1cm39.501cmDateTimetrueTrueDateTimetrue结束日期TrueInteger项目IDTruetrue项目表_DataSet项目名称IDIntegertrue版本IDTrue版本表_DataSet名称加版本号IDtrueStringtrue执行人True用户信息视图_DataSet全名用户名jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"执行人":{"type":"string"},"项目ID":{"type":"integer"},"项目":{"type":"string"},"版本ID":{"type":"integer"},"版本":{"type":"string"},"任务":{"type":"string"},"执行内容":{"type":"string"},"计划工时":{"type":"number"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/2c95e2a9-2e3a-492b-a2eb-f97669c8e580;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"},"项目代号":{"type":"string"},"项目简介":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/f9f2ca80-339c-47ab-b41a-078a0a32de1d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目ID":{"type":"integer"},"名称加版本号":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/514ebb17-c46f-48fc-9097-169e0c003849;schemadata={"type":"array","items":{"type":"object","properties":{"用户名":{"type":"string"},"全名":{"type":"string"}}}}JSON日期执行人项目ID项目版本ID版本任务执行内容计划工时上报工时核定工时=Fields!日期.Value=Parameters!开始日期.ValueGreaterThanOrEqual=Fields!日期.Value=Parameters!结束日期.ValueLessThanOrEqual=Fields!项目ID.Value=Parameters!项目ID.ValueEqual=Fields!版本ID.Value=Parameters!版本ID.ValueEqual=Fields!执行人.Value=Parameters!执行人.ValueEqual$.[*]工时表ID项目名称项目代号项目简介$.[*]项目表ID项目ID名称加版本号=Fields!项目ID.Value=Parameters!项目ID.ValueEqual$.[*]版本表用户名全名$.[*]用户信息视图DisplayTypeGalleySizeTypeFitToPagePaperOrientationLandscapeParametersView{"controls":[{"left":15,"top":15,"width":200,"height":60,"control":{"type":"date-time","binding":"开始日期","label":{"display":"top","text":"","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}},"daysViewHeaderFormat":""}},{"left":15,"top":75,"width":200,"height":60,"control":{"type":"date-time","binding":"结束日期","label":{"display":"top","text":"结束日期","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}},"daysViewHeaderFormat":""}},{"left":15,"top":135,"width":200,"height":60,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":15,"top":195,"width":200,"height":60,"control":{"type":"dropdown","binding":"版本ID","label":{"display":"top","text":"版本","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":15,"top":255,"width":200,"height":60,"control":{"type":"dropdown","binding":"执行人","label":{"display":"top","text":"执行人","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":15,"top":325,"width":200,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}}]}DefaultTheme.rdlx-theme \ No newline at end of file +人员工时报表.rdlx6cm0cm0cm40cm6cm工时表_DataSet人员工时报表Auto
true2.25cm6true=" " & Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "人员工时统计表"1cmtrue文本框1项目true文本框12版本2true文本框2任务true文本框17上报工时true文本框21核定工时
=Fields.Item("项目ID").Value=Fields.Item("版本ID").Value=Fields!任务ID.ValueAscending=Fields.Item("执行人").ValueAscending=Fields.Item("项目ID").ValueAscending=Fields.Item("版本ID").ValueAscending=Fields.Item("任务").Value0.75cmTrueRestrictedtrue项目=Fields.Item("项目").ValueTrueRestrictedtrue版本=Fields.Item("版本").ValueTrueRestricted2true任务=Fields.Item("任务").Valuetrue上报工时=Fields.Item("总上报工时").Valuetrue核定工时=Fields.Item("总核定工时").Value
1cm4true合计true文本框45=Sum(Fields.Item("总上报工时").Value)true文本框46=Sum(Fields.Item("总核定工时").Value)
8.372cm7.063cm7.816cm8.931cm3.907cm3.911cm
true1cmtrue=Fields.Item("执行人").Value & " "3true小计true=Sum(Fields.Item("总上报工时").Value)true=Sum(Fields.Item("总核定工时").Value)
=Fields.Item("执行人").Value
1cmtruetrue0cm0cm40cm1cmtrue + b89954dd-a360-4909-926a-34ae179f314f + 空白样式 +="第 " & Globals!PageNumber & " 页 共 " & Globals!TotalPages & " 页"1cm1cm29.7cm42cm1cm1cm40cmDateTimetrueTrueDateTimetrue结束日期TrueIntegertrue项目IDTrue项目表_DataSet项目名称IDIntegertrue版本IDTrue版本表_DataSet名称加版本号IDtrueStringtrue执行人True用户信息视图_DataSet全名用户名jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"执行人":{"type":"string"},"执行人用户名":{"type":"string"},"项目ID":{"type":"integer"},"项目":{"type":"string"},"版本ID":{"type":"integer"},"版本":{"type":"string"},"任务ID":{"type":"integer"},"任务":{"type":"string"},"总上报工时":{"type":"number"},"总核定工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/2c95e2a9-2e3a-492b-a2eb-f97669c8e580;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"},"项目代号":{"type":"string"},"项目简介":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/f9f2ca80-339c-47ab-b41a-078a0a32de1d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目ID":{"type":"integer"},"名称加版本号":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/514ebb17-c46f-48fc-9097-169e0c003849;schemadata={"type":"array","items":{"type":"object","properties":{"用户名":{"type":"string"},"全名":{"type":"string"}}}}JSON日期执行人执行人用户名项目ID项目版本ID版本任务ID任务总上报工时总核定工时=Fields!日期.Value=IIF(IsNothing(Parameters!开始日期.Value), Fields!开始日期.Value, Parameters!开始日期.Value)GreaterThanOrEqual=Fields!日期.Value=IIF(IsNothing(Parameters!结束日期.Value), Fields!结束日期.Value, Parameters!结束日期.Value)LessThanOrEqual=Fields!项目ID.Value=IIF(IsNothing(Parameters!项目ID.Value), Fields!项目ID.Value, Parameters!项目ID.Value)Equal=Fields!版本ID.Value=IIF(IsNothing(Parameters!版本ID.Value), Fields!版本ID.Value, Parameters!版本ID.Value)Equal=Fields!执行人用户名.Value=IIF(IsNothing(Parameters!执行人.Value), Fields!执行人用户名.Value, Parameters!执行人.Value)Equal$.[*]工时表ID项目名称项目代号项目简介$.[*]项目表ID项目ID名称加版本号=Fields!项目ID.Value=Parameters!项目ID.ValueEqual$.[*]版本表用户名全名$.[*]用户信息视图DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":365,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":605,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"版本ID","label":{"display":"top","text":"版本","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":845,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"执行人","label":{"display":"top","text":"执行人","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":1210,"top":35,"width":125,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":10,"top":5,"width":345,"height":75,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["years",1],"viewMode":"days","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}},{"left":1100,"top":35,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}}]}DefaultTheme.rdlx-theme \ No newline at end of file diff --git a/Reports/客户工时报表.json b/Reports/客户工时报表.json new file mode 100644 index 00000000..5b9617cf --- /dev/null +++ b/Reports/客户工时报表.json @@ -0,0 +1,281 @@ +{ + "Name": "客户工时报表", + "DataSources": [ + { + "Name": "工时表", + "GUID": "34dec195-948f-493a-8364-02df3b09b8c6", + "DataSourceSetting": { + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "GUID": "7ab3e0a5-345d-41be-b40f-cb9f12da81d3", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "83a8cb6c-7485-4b61-a2f1-3dfe07828f53", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "所属客户" + } + }, + "ColumnName": "所属客户" + }, + { + "GUID": "3a68f760-ab3e-4878-b3c1-876d20d85271", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "c554b7d7-210f-428c-b5c8-53d3d9b68f84", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "所属客户部门" + } + }, + "ColumnName": "所属客户部门" + }, + { + "GUID": "e6317f36-88ff-4da6-9f7a-1980fe4b4f78", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "5c45e4e4-202f-47c4-a864-46e79706c52c" + }, + "ColumnName": "日期" + }, + { + "GUID": "ad17c830-f612-4720-ae3f-f2eaaa2e7393", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "0614a00c-1af1-49cc-9b79-ccf3513069de", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人" + }, + { + "GUID": "a05d5513-0bde-4257-94e8-f80338652c9b", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "e3029b2a-dcec-4c12-bdbb-f9cf00e7890a" + }, + "ColumnName": "项目ID" + }, + { + "GUID": "ba1026cc-1679-425b-b862-67c510713f2f", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目名称", + "GUID": "583e5d5b-40e0-4a59-891e-30351ebc5d4a" + }, + "ColumnName": "项目名称" + }, + { + "GUID": "8d94994e-8e83-4efc-a811-63224c9356c7", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "ea6af271-a726-4166-a750-2399f73875d1", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目代号" + } + }, + "ColumnName": "项目代号" + }, + { + "GUID": "834b1fa6-5597-4e77-a8ff-c38cb080f559", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "99b0a01a-2530-4fe7-8a22-7b618aaeba03" + }, + "ColumnName": "任务ID" + }, + { + "GUID": "02c13038-a73c-4b6e-a787-b28dfc9ff37f", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务名称", + "GUID": "1409de08-8af1-454e-b331-bc38d29f497e" + }, + "ColumnName": "任务名称" + }, + { + "GUID": "fc668fa2-2128-4b5a-ac7c-b2cbb02c1fce", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "c9348399-b6ad-45ce-bf61-79a0e4348934", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本", + "NextRelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "版本名称" + } + } + }, + "ColumnName": "版本名称" + }, + { + "GUID": "585ef762-60ca-4584-bc3e-7e17b7a0255b", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行内容", + "GUID": "f60c3820-94a6-49b4-9c02-14c5a593c944" + }, + "ColumnName": "执行内容" + }, + { + "GUID": "45890c60-f1c5-49b0-9ea3-cb6b7cee9a00", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "40a3a387-1863-4fb3-9619-c1f768bd2b24" + }, + "ColumnName": "上报工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 2, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "76027b54-2310-4946-b120-2376da07a655" + }, + "Value": "0" + } + }, + "ColumnsType": [ + "integer", + "integer", + "date-time", + "string", + "integer", + "string", + "string", + "integer", + "string", + "string", + "string", + "number" + ] + }, + { + "Name": "客户表", + "GUID": "e2702e2e-d2cf-4678-86b2-98b675666b47", + "DataSourceSetting": { + "TableName": "客户表", + "BindingInfos": [ + { + "GUID": "e1967e3b-1188-475c-81eb-f6832b550126", + "BindingInfo": { + "TableName": "客户表", + "ColumnName": "ID", + "GUID": "77846f21-5096-4d64-b49d-ef462fe94569" + }, + "ColumnName": "ID" + }, + { + "GUID": "c008a240-9240-4d41-829c-ceb226f7d6da", + "BindingInfo": { + "TableName": "客户表", + "ColumnName": "客户名称", + "GUID": "13bddc6f-684e-44cd-a6f4-14e43a5426d8" + }, + "ColumnName": "客户名称" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "客户表", + "ColumnName": "删除", + "GUID": "61812702-3e37-4f5f-b60d-ade7bf90b9e8" + }, + "Value": "1" + } + }, + "ColumnsType": [ + "integer", + "string" + ] + }, + { + "Name": "客户部门", + "GUID": "9cbbe954-b292-43d0-888a-aab456f332ca", + "DataSourceSetting": { + "TableName": "客户部门表", + "BindingInfos": [ + { + "GUID": "9c169d21-9c50-4b2b-86d3-3287f254dfba", + "BindingInfo": { + "TableName": "客户部门表", + "ColumnName": "ID", + "GUID": "ea95d20d-4b14-483e-9075-52e143f83b3c" + }, + "ColumnName": "ID" + }, + { + "GUID": "4e6d2860-e7a6-4d86-913e-ee63ab9da727", + "BindingInfo": { + "TableName": "客户部门表", + "ColumnName": "客户ID", + "GUID": "5c6dc0bf-7414-42d6-adec-bf8fcabc5fe5" + }, + "ColumnName": "客户ID" + }, + { + "GUID": "df730495-3c7e-4534-a8a2-631954009375", + "BindingInfo": { + "TableName": "客户部门表", + "ColumnName": "部门名称", + "GUID": "c63eb029-8273-452f-a69b-9a546150fbec" + }, + "ColumnName": "部门名称" + } + ] + }, + "ColumnsType": [ + "integer", + "integer", + "string" + ] + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionResource, Forguncy.RbacPermission.Core", + "activeReportType": 1 + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", + "activeReportPermissionType": 1, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", + "activeReportPermissionType": 2, + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "ReportType": 1 +} \ No newline at end of file diff --git a/Reports/客户工时报表.rdlx b/Reports/客户工时报表.rdlx new file mode 100644 index 00000000..9c638eb1 --- /dev/null +++ b/Reports/客户工时报表.rdlx @@ -0,0 +1 @@ +客户工时报表.rdlx5.251cm0cm0cm33.951cm5.251cm工时表_DataSet客户工时报表Auto
true1.751cm6true项目服务月度报表0.75cmtrue日期true任务true文本框3负责人true版本true内容true工时
Ascending=Fields.Item("项目ID").ValueAscending=Fields.Item("日期").ValueAscending=Fields.Item("任务ID").ValueAscending=Fields.Item("执行人").Value0.75cmTrueRestrictedtrue日期=Fields.Item("日期").ValueTrueRestrictedtrue任务名称=Fields.Item("任务名称").ValueTrueRestrictedtrue执行人=Fields.Item("执行人").ValueTrueRestrictedtrue版本名称=Fields.Item("版本名称").Valuetrue执行内容=Fields.Item("执行内容").Valuetrue上报工时=Fields.Item("上报工时").Value
1cm5true合计true=Sum(Fields!上报工时.Value)
5.538cm5.035cm4.927cm4.001cm10.401cm4.049cm
true1cm4true项目名称=Fields!项目名称.Value & IIF(IsNothing(Fields!项目代号.Value), "", "(" & Fields!项目代号.Value & ")")true小计true=Sum(Fields!上报工时.Value)
=Fields.Item("项目ID").Value
1cm1cm21cm36cm1cm1cm33.951cmInteger客户True客户表_DataSet客户名称IDInteger部门True客户部门_DataSet部门名称ID客户部门_DataSetIDjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/34dec195-948f-493a-8364-02df3b09b8c6;schemadata={"type":"array","items":{"type":"object","properties":{"所属客户":{"type":"integer"},"所属客户部门":{"type":"integer"},"日期":{"type":"date-time"},"执行人":{"type":"string"},"项目ID":{"type":"integer"},"项目名称":{"type":"string"},"项目代号":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"版本名称":{"type":"string"},"执行内容":{"type":"string"},"上报工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e2702e2e-d2cf-4678-86b2-98b675666b47;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户名称":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/9cbbe954-b292-43d0-888a-aab456f332ca;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"客户ID":{"type":"integer"},"部门名称":{"type":"string"}}}}JSON所属客户所属客户部门日期执行人项目ID项目名称项目代号任务ID任务名称版本名称执行内容上报工时=Fields!所属客户.Value=Parameters!客户.ValueEqual=Fields!所属客户部门.Value=Parameters!部门.ValueEqual$.[*]工时表ID客户名称$.[*]客户表ID客户ID部门名称=Fields!客户ID.Value=Parameters!客户.ValueEqual$.[*]客户部门DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":25,"top":10,"width":200,"height":75,"control":{"type":"dropdown","binding":"客户","label":{"display":"top","text":"客户","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":235,"top":10,"width":200,"height":75,"control":{"type":"dropdown","binding":"部门","label":{"display":"top","text":"部门","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":575,"top":40,"width":100,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":465,"top":40,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}}]}DefaultTheme.rdlx-theme \ No newline at end of file diff --git a/Reports/项目工时报表.json b/Reports/项目工时报表.json new file mode 100644 index 00000000..1be5ab44 --- /dev/null +++ b/Reports/项目工时报表.json @@ -0,0 +1,357 @@ +{ + "Name": "项目工时报表", + "DataSources": [ + { + "Name": "任务表", + "GUID": "b496c790-735b-421c-a389-bfadb91fde62", + "DataSourceSetting": { + "TableName": "任务表", + "BindingInfos": [ + { + "GUID": "965b8870-750c-415f-bc29-fc919e7e47cf", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "3789dc3f-98b6-4e6a-9b36-8a4e87593f1a" + }, + "ColumnName": "ID" + }, + { + "GUID": "f626eaee-10c1-458d-8bf3-fe354879d738", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "823f9a5d-891a-4e92-bf9b-8b2fc2794c7e" + }, + "ColumnName": "任务名称" + }, + { + "GUID": "94e64ff2-c53a-4a39-bfca-b50fdd183086", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务负责人", + "GUID": "f0687aff-e0ac-4725-9cf2-4925a37a432e", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "任务负责人" + }, + { + "GUID": "b0b76224-58b1-46ef-b380-31fa3264ccb0", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "cfacbfce-0591-4f73-8a74-187348a64035" + }, + "ColumnName": "版本" + }, + { + "GUID": "1c3b2782-5bcc-4257-91c3-2f1fc7ec7416", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "70b798e0-0260-4fb3-a7a3-3b6437e7a072", + "RelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "版本名称" + } + }, + "ColumnName": "版本名称" + }, + { + "GUID": "0cb4e751-6e10-4ee4-b66a-54c0b11802fb", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务预算工时", + "GUID": "645a83aa-c1bc-45c8-917f-a399a0fdb3dc" + }, + "ColumnName": "任务预算工时" + } + ] + }, + "ColumnsType": [ + "integer", + "string", + "string", + "integer", + "string", + "number" + ] + }, + { + "Name": "项目表", + "GUID": "e137dd12-5ee8-49e2-885c-b957f39a7e6d", + "DataSourceSetting": { + "TableName": "项目表", + "BindingInfos": [ + { + "GUID": "daf6a5e1-a959-4a9d-bcc4-a50c27608c6d", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "1df6b99c-de0a-4b46-ad14-be3659cffb8f" + }, + "ColumnName": "ID" + }, + { + "GUID": "a7a57a98-7e8f-4adf-b0ee-44d1b599d0f3", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "1a4d4dc2-279d-4263-a47f-547ead2fa0d4" + }, + "ColumnName": "项目名称" + }, + { + "GUID": "02d100fe-afb1-459b-b9f3-6adaca622690", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目代号", + "GUID": "e093c4b1-3f02-46ae-833c-5a3e554c816d" + }, + "ColumnName": "项目代号" + }, + { + "GUID": "2a767c37-bbc5-459d-b011-964b3b3902d1", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目经理", + "GUID": "64d18373-81c7-4db5-9071-16455b0e2835", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "项目经理" + }, + { + "GUID": "5c3d22c7-8f82-44f2-91eb-8b44b954354e", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "商务经理", + "GUID": "1108c423-c5a4-4cf1-8ee5-10c387c08f94", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "商务经理" + }, + { + "GUID": "65fd6a79-7b81-454c-8242-af45334d7920", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "客服经理", + "GUID": "19831998-e648-47a4-95c5-a81d6a89ef95", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "客服经理" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "删除", + "GUID": "336a9436-ad44-4167-9498-bb513c202161" + }, + "Value": "1" + } + }, + "ColumnsType": [ + "integer", + "string", + "string", + "string", + "string", + "string" + ] + }, + { + "Name": "工时表", + "GUID": "fa568b7a-3657-42fd-9a30-16d65c837b91", + "DataSourceSetting": { + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "GUID": "13d0907c-6801-4f55-ba14-f8d72d28385f", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "24beea6f-ea24-43dc-893f-6187bb09d16f" + }, + "ColumnName": "日期" + }, + { + "GUID": "6641c267-5f86-4c44-bcc0-73882b7a4e36", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "04ed2898-7612-480d-8122-aabe23cdbdf8" + }, + "ColumnName": "项目ID" + }, + { + "GUID": "ddd6f147-4383-4323-b82e-50bec9259065", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "74c2fc0e-4dec-4285-844f-d07e16d5bd8b" + }, + "ColumnName": "任务ID" + }, + { + "GUID": "1933ca45-6a0b-4c04-a1df-ba956e8f7b0f", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "5809be93-2eda-463d-95d1-69364ab26756", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本" + } + }, + "ColumnName": "版本ID" + }, + { + "GUID": "5fe58383-a225-44ca-a8d2-48d82547b9f5", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目名称", + "GUID": "8ab925dc-0f21-45ed-baf5-86d8eeb8c23e" + }, + "ColumnName": "项目名称" + }, + { + "GUID": "f82eb5fe-3b2c-4dba-8a15-b585ae965caa", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "2d5ec48c-ceb0-4988-882f-69588c95d4a2", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本", + "NextRelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "名称加版本号" + } + } + }, + "ColumnName": "名称加版本号" + }, + { + "GUID": "f7ea0210-8776-4da1-bb9f-6865b3f57e44", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务名称", + "GUID": "f3f10905-1688-4c17-942d-6deb109efa2d" + }, + "ColumnName": "任务名称" + }, + { + "GUID": "8b7deba0-ce7a-473e-87d5-f147ea70a2f9", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "c1752c6f-7efc-44a2-acd7-844ea5e95c40", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "任务说明" + } + }, + "ColumnName": "任务说明" + }, + { + "GUID": "cc362e7f-fd44-4ec0-b8d7-a3c0bb5c6495", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "926f9477-8918-4a1b-bc36-8d37f8b5ee4f", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人" + }, + { + "GUID": "c10b318c-d9dc-4953-912d-1daa8ed0afa5", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行内容", + "GUID": "8c813fd0-cee4-4da3-93df-a24aa9e71ed1" + }, + "ColumnName": "执行内容" + }, + { + "GUID": "a822fec4-6c81-4aec-85f7-b2b1480c7a15", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "16f19bcd-5101-47bf-a65a-b0be98d9ebae" + }, + "ColumnName": "总计划工时" + }, + { + "GUID": "b865d3b5-9b7a-4b44-be75-613d265cc245", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总核定工时", + "GUID": "93d8692a-0a62-4b83-8f2e-98ada4e90fa2" + }, + "ColumnName": "总核定工时" + } + ] + }, + "ColumnsType": [ + "date-time", + "integer", + "integer", + "integer", + "string", + "string", + "string", + "string", + "string", + "string", + "number", + "number" + ] + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionResource, Forguncy.RbacPermission.Core", + "activeReportType": 1 + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", + "activeReportPermissionType": 1, + "roleNames": [ + "FGC_LoginUser" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", + "activeReportPermissionType": 2, + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "ReportType": 1 +} \ No newline at end of file diff --git a/Reports/项目工时报表.rdlx b/Reports/项目工时报表.rdlx new file mode 100644 index 00000000..5eb08e25 --- /dev/null +++ b/Reports/项目工时报表.rdlx @@ -0,0 +1 @@ +项目工时报表.rdlx5.25cm0cm0.002cm27.654cm5.25cm工时表_DataSet项目工时报表Auto
true2cm4true=Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "项目工时报表"0.75cmtrue任务true执行内容true总计划工时true总核定工时
=Fields!任务ID.Value0.75cmtrue任务名称=Fields!任务名称.Valuetrue执行内容=Fields!执行内容.Valuetrue总计划工时=Fields!总计划工时.Valuetrue总核定工时=Fields!总核定工时.Value
1cm2true合计true=Sum(Fields!总计划工时.Value)true=Sum(Fields!总核定工时.Value)
6.499cm12.499cm4.328cm4.328cm
true0.75cmtrue项目名称=Fields!项目名称.Valuetrue小计true=Sum(Fields!总计划工时.Value)true=Sum(Fields!总核定工时.Value)
=Fields!项目ID.Value
1cm1cm21cm29.7cm1cm1cm27.656cmDateTime开始日期TrueDateTime结束日期TrueInteger项目Truetrue项目表_DataSet项目名称IDjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/b496c790-735b-421c-a389-bfadb91fde62;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"任务名称":{"type":"string"},"任务负责人":{"type":"string"},"版本":{"type":"integer"},"版本名称":{"type":"string"},"任务预算工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e137dd12-5ee8-49e2-885c-b957f39a7e6d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"},"项目代号":{"type":"string"},"项目经理":{"type":"string"},"商务经理":{"type":"string"},"客服经理":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/fa568b7a-3657-42fd-9a30-16d65c837b91;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"项目ID":{"type":"integer"},"任务ID":{"type":"integer"},"版本ID":{"type":"integer"},"项目名称":{"type":"string"},"名称加版本号":{"type":"string"},"任务名称":{"type":"string"},"任务说明":{"type":"string"},"执行人":{"type":"string"},"执行内容":{"type":"string"},"总计划工时":{"type":"number"},"总核定工时":{"type":"number"}}}}JSONID任务名称任务负责人版本版本名称任务预算工时$.[*]任务表ID项目名称项目代号项目经理商务经理客服经理$.[*]项目表日期项目ID任务ID版本ID项目名称名称加版本号任务名称任务说明执行人执行内容总计划工时总核定工时=Fields!日期.Value=IIF(IsNothing(Parameters!开始日期.Value), Fields!开始日期.Value, Parameters!开始日期.Value)GreaterThanOrEqual=Fields!日期.Value=IIF(IsNothing(Parameters!结束日期.Value), Fields!结束日期.Value, Parameters!结束日期.Value)LessThanOrEqual=Fields!项目ID.Value=IIF(IsNothing(Parameters!项目ID.Value), Fields!项目ID.Value, Parameters!项目ID.Value)In$.[*]工时表DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":360,"top":15,"width":200,"height":60,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":680,"top":45,"width":110,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":570,"top":45,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}},{"left":15,"top":15,"width":335,"height":60,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme \ No newline at end of file