diff --git a/.collaboration b/.collaboration index 82cc9b62..6e97021f 100644 --- a/.collaboration +++ b/.collaboration @@ -2230,50 +2230,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-17T15:02:07.8547009+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin1.zip", - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\ReadLogs.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_2_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2513,17 +2470,7 @@ }, { "ModuleName": "RdlReport/人员工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-17T15:01:17.7380934+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\人员工时报表.json", - "Reports\\人员工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/客户工时报表", @@ -2531,16 +2478,6 @@ }, { "ModuleName": "RdlReport/项目工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-17T14:59:55.0654852+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\项目工时报表.json", - "Reports\\项目工时报表.rdlx" - ] + "ModuleType": 18 } ] \ No newline at end of file diff --git a/Plugin/内容编辑器-9_0_103_0.zip b/Plugin/内容编辑器-9_0_103_0.zip new file mode 100644 index 00000000..439281c8 Binary files /dev/null and b/Plugin/内容编辑器-9_0_103_0.zip differ diff --git a/Reports/人员工时报表.json b/Reports/人员工时报表.json index 108b26b5..632de884 100644 --- a/Reports/人员工时报表.json +++ b/Reports/人员工时报表.json @@ -8,7 +8,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "37d76f01-2270-46b1-96ca-9eaeacd040f0", + "GUID": "436cda2c-a722-4bec-8ed9-d207cb7695d1", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", @@ -17,7 +17,7 @@ "ColumnName": "日期" }, { - "GUID": "6d5d94e1-46f5-43ae-b33a-286f8ea2a042", + "GUID": "95c0df17-e05f-4951-ac27-e7dbe1e71e92", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -30,7 +30,7 @@ "ColumnName": "执行人" }, { - "GUID": "74776e95-9333-4c56-a8f0-cb4aa9db2be1", + "GUID": "0dc4cb02-e1e6-4be9-b01f-f88d500ee50a", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -39,7 +39,7 @@ "ColumnName": "执行人用户名" }, { - "GUID": "df69338f-6a40-4b9a-b58d-bf7fbab2bc32", + "GUID": "5dc1a5de-f96c-470c-9849-3120e8cb61fc", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", @@ -48,7 +48,7 @@ "ColumnName": "项目ID" }, { - "GUID": "5b78544e-5b61-48c3-b73e-32756b6f5a9a", + "GUID": "93413d04-203b-4e9f-a8d9-11ec9b377086", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", @@ -62,7 +62,7 @@ "ColumnName": "项目" }, { - "GUID": "6ae1d98d-6967-4767-a3fa-56960df3c1ff", + "GUID": "17d02ae0-2ad1-4edd-a07e-508393adf86c", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -76,11 +76,11 @@ "ColumnName": "版本ID" }, { - "GUID": "a9b23355-a4d5-43cd-a408-7d50a048213b", + "GUID": "90ada791-e8fd-4a70-9c68-7427d8372bba", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", - "GUID": "5e392f5e-fa5f-4178-9dc6-47fa3e963cf3", + "GUID": "ec0a633e-c253-4260-8c2e-2655e19dd0ff", "RelationBinding": { "RelatedTable": "任务平行视图", "RelatedColumn": "ID", @@ -88,14 +88,14 @@ "NextRelationBinding": { "RelatedTable": "项目版本", "RelatedColumn": "ID", - "DisplayColumn": "名称加版本号" + "DisplayColumn": "版本名称" } } }, - "ColumnName": "版本" + "ColumnName": "版本名称" }, { - "GUID": "6fc900d0-7809-4cc4-87ef-e87854a274a7", + "GUID": "3d0575e2-5162-4a14-a8c6-718abf57c8ed", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -104,7 +104,7 @@ "ColumnName": "任务ID" }, { - "GUID": "2f79211a-5928-42d4-b974-102db51a4ac8", + "GUID": "4ef8d28c-06f4-472d-95a0-0fca170078bb", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -118,7 +118,7 @@ "ColumnName": "任务" }, { - "GUID": "ad0411bb-9a38-46ec-b6a9-bf9f5b69a6d2", + "GUID": "01a18a60-f00f-414b-9145-13ca241e0c85", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总上报工时", @@ -127,7 +127,7 @@ "ColumnName": "总上报工时" }, { - "GUID": "4f497231-8e85-4835-ae05-89634c586e52", + "GUID": "ef72e335-973b-4373-be46-9989f1009bb9", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总核定工时", @@ -180,7 +180,7 @@ "TableName": "项目表", "BindingInfos": [ { - "GUID": "fce01d85-e7bb-4241-aa0c-b49a1ef70ed4", + "GUID": "8dda9a0a-b6bb-49df-8dc9-d316c21bbfee", "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", @@ -189,38 +189,18 @@ "ColumnName": "ID" }, { - "GUID": "6ec54d74-affc-47b0-88db-7d8cef10d75a", + "GUID": "445e2f0b-b018-4d86-977e-ae587dea87f1", "BindingInfo": { "TableName": "项目表", "ColumnName": "项目名称", "GUID": "0bd6fee7-9b55-4f7b-8e52-51ef89d9af45" }, "ColumnName": "项目名称" - }, - { - "GUID": "58bc4df2-349e-4175-a7f5-7d336e47dc27", - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目代号", - "GUID": "8922ca23-f9e5-4272-aa55-6b2a7e864f4c" - }, - "ColumnName": "项目代号" - }, - { - "GUID": "0881d871-6882-47b5-8a47-cf6b88972220", - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目简介", - "GUID": "4643269b-5887-4007-9142-2dbb23458e88" - }, - "ColumnName": "项目简介" } ] }, "ColumnsType": [ "integer", - "string", - "string", "string" ] }, @@ -231,7 +211,7 @@ "TableName": "项目版本", "BindingInfos": [ { - "GUID": "9d8b1dc1-590e-40dc-b821-701329d22d73", + "GUID": "5783c226-fba4-4f71-be58-9cd05e1b1a5b", "BindingInfo": { "TableName": "项目版本", "ColumnName": "ID", @@ -240,7 +220,7 @@ "ColumnName": "ID" }, { - "GUID": "67f36a47-b896-44db-bc34-97fdeea45b64", + "GUID": "39b8f7b2-617d-4d33-b5dc-8777e6693ded", "BindingInfo": { "TableName": "项目版本", "ColumnName": "项目ID", @@ -249,13 +229,13 @@ "ColumnName": "项目ID" }, { - "GUID": "6aee4b23-f034-4f0e-a7be-1c17620fab46", + "GUID": "17a72c10-51fd-47f8-85a9-1330d96206b0", "BindingInfo": { "TableName": "项目版本", - "ColumnName": "名称加版本号", - "GUID": "dd94321a-b078-4a86-9ff5-a08739c67a2f" + "ColumnName": "版本名称", + "GUID": "c2705c8d-0d35-4c08-9632-79e631731bd9" }, - "ColumnName": "名称加版本号" + "ColumnName": "版本名称" } ] }, diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx index 8cc109b9..03ba6fe8 100644 --- a/Reports/人员工时报表.rdlx +++ b/Reports/人员工时报表.rdlx @@ -1,4 +1,4 @@ -人员工时报表.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 +人员工时报表.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.Item("任务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 +="第 " & 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"}}}}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.Item("日期").Value=IIF(IsNothing(Parameters.Item("开始日期").Value), Fields.Item("开始日期").Value, Parameters.Item("开始日期").Value)GreaterThanOrEqual=Fields.Item("日期").Value=IIF(IsNothing(Parameters.Item("结束日期").Value), Fields.Item("结束日期").Value, Parameters.Item("结束日期").Value)LessThanOrEqual=Fields.Item("项目ID").Value=IIF(IsNothing(Parameters.Item("项目ID").Value), Fields.Item("项目ID").Value, Parameters.Item("项目ID").Value)Equal=Fields.Item("版本ID").Value=IIF(IsNothing(Parameters.Item("版本ID").Value), Fields.Item("版本ID").Value, Parameters.Item("版本ID").Value)Equal=Fields.Item("执行人用户名").Value=IIF(IsNothing(Parameters.Item("执行人").Value), Fields.Item("执行人用户名").Value, Parameters.Item("执行人").Value)Equal$.[*]工时表ID项目名称$.[*]项目表ID项目ID版本名称=Fields.Item("项目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 index 1be5ab44..3c31a20f 100644 --- a/Reports/项目工时报表.json +++ b/Reports/项目工时报表.json @@ -8,7 +8,7 @@ "TableName": "任务表", "BindingInfos": [ { - "GUID": "965b8870-750c-415f-bc29-fc919e7e47cf", + "GUID": "c898b8ad-6868-4792-8ef6-05f64868a70a", "BindingInfo": { "TableName": "任务表", "ColumnName": "ID", @@ -17,68 +17,19 @@ "ColumnName": "ID" }, { - "GUID": "f626eaee-10c1-458d-8bf3-fe354879d738", + "GUID": "9a7199d5-9392-41e2-94ff-a567f55c71ea", "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" + "string" ] }, { @@ -88,7 +39,7 @@ "TableName": "项目表", "BindingInfos": [ { - "GUID": "daf6a5e1-a959-4a9d-bcc4-a50c27608c6d", + "GUID": "4ac29c60-8d92-44d9-abfa-70a5b4407c87", "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", @@ -97,61 +48,13 @@ "ColumnName": "ID" }, { - "GUID": "a7a57a98-7e8f-4adf-b0ee-44d1b599d0f3", + "GUID": "f052ae2d-04b8-407b-b2e1-f06b2399361e", "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": { @@ -167,10 +70,6 @@ }, "ColumnsType": [ "integer", - "string", - "string", - "string", - "string", "string" ] }, @@ -181,7 +80,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "13d0907c-6801-4f55-ba14-f8d72d28385f", + "GUID": "f769ed8e-d10c-47d0-ac37-05c05a7b3d4e", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", @@ -190,7 +89,7 @@ "ColumnName": "日期" }, { - "GUID": "6641c267-5f86-4c44-bcc0-73882b7a4e36", + "GUID": "246d254b-3165-4602-9f71-7a9542898113", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", @@ -199,7 +98,7 @@ "ColumnName": "项目ID" }, { - "GUID": "ddd6f147-4383-4323-b82e-50bec9259065", + "GUID": "8e1ce463-9e1a-43ec-88e7-7ae2ed04b0de", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -208,7 +107,7 @@ "ColumnName": "任务ID" }, { - "GUID": "1933ca45-6a0b-4c04-a1df-ba956e8f7b0f", + "GUID": "d08c0cca-b87f-4931-a9df-17906570eccc", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -222,7 +121,7 @@ "ColumnName": "版本ID" }, { - "GUID": "5fe58383-a225-44ca-a8d2-48d82547b9f5", + "GUID": "371c3a20-5957-418c-a90f-e9a3f11c11ed", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目名称", @@ -231,11 +130,11 @@ "ColumnName": "项目名称" }, { - "GUID": "f82eb5fe-3b2c-4dba-8a15-b585ae965caa", + "GUID": "9ed038ce-4b1f-4b0f-aedb-b0602236c9e3", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", - "GUID": "2d5ec48c-ceb0-4988-882f-69588c95d4a2", + "GUID": "3e823461-6857-41e4-99f1-2bc0bba7f3e5", "RelationBinding": { "RelatedTable": "任务平行视图", "RelatedColumn": "ID", @@ -243,14 +142,14 @@ "NextRelationBinding": { "RelatedTable": "项目版本", "RelatedColumn": "ID", - "DisplayColumn": "名称加版本号" + "DisplayColumn": "版本名称" } } }, - "ColumnName": "名称加版本号" + "ColumnName": "版本名称" }, { - "GUID": "f7ea0210-8776-4da1-bb9f-6865b3f57e44", + "GUID": "2566704f-32b9-4379-a870-f09e85c79a41", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务名称", @@ -259,7 +158,7 @@ "ColumnName": "任务名称" }, { - "GUID": "8b7deba0-ce7a-473e-87d5-f147ea70a2f9", + "GUID": "e481adf9-970f-4912-a0a1-1c23aeb4e47f", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -273,7 +172,7 @@ "ColumnName": "任务说明" }, { - "GUID": "cc362e7f-fd44-4ec0-b8d7-a3c0bb5c6495", + "GUID": "0cffe8ab-1e70-4a2f-9bc8-614eb930bf2c", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -286,7 +185,7 @@ "ColumnName": "执行人" }, { - "GUID": "c10b318c-d9dc-4953-912d-1daa8ed0afa5", + "GUID": "28744cb3-cf7e-4a34-a573-9f4979279f5a", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行内容", @@ -295,7 +194,7 @@ "ColumnName": "执行内容" }, { - "GUID": "a822fec4-6c81-4aec-85f7-b2b1480c7a15", + "GUID": "65a814b4-cc42-42cc-a93a-d73488380218", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总计划工时", @@ -304,7 +203,7 @@ "ColumnName": "总计划工时" }, { - "GUID": "b865d3b5-9b7a-4b44-be75-613d265cc245", + "GUID": "82853999-23d5-40de-958c-4b67638af576", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "总核定工时", diff --git a/Reports/项目工时报表.rdlx b/Reports/项目工时报表.rdlx index 5eb08e25..a1369165 100644 --- a/Reports/项目工时报表.rdlx +++ b/Reports/项目工时报表.rdlx @@ -1 +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 +项目工时报表.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.Item("任务ID").Value0.75cmtrue任务名称=Fields.Item("任务名称").Valuetrue执行内容=Fields.Item("执行内容").Valuetrue总计划工时=Fields.Item("总计划工时").Valuetrue总核定工时=Fields.Item("总核定工时").Value
1cm2true合计true=Sum(Fields.Item("总计划工时").Value)true=Sum(Fields.Item("总核定工时").Value)
6.499cm12.499cm4.328cm4.328cm
true0.75cmtrue项目名称=(Fields.Item("项目名称").Value & "-") & Fields.Item("版本名称").Valuetrue小计true=Sum(Fields.Item("总计划工时").Value)true=Sum(Fields.Item("总核定工时").Value)
=Fields.Item("项目ID").Value=Fields.Item("版本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"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/e137dd12-5ee8-49e2-885c-b957f39a7e6d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"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.Item("日期").Value=IIF(IsNothing(Parameters.Item("开始日期").Value), Fields.Item("开始日期").Value, Parameters.Item("开始日期").Value)GreaterThanOrEqual=Fields.Item("日期").Value=IIF(IsNothing(Parameters.Item("结束日期").Value), Fields.Item("结束日期").Value, Parameters.Item("结束日期").Value)LessThanOrEqual=Fields.Item("项目ID").Value=IIF(IsNothing(Parameters.Item("项目ID").Value), Fields.Item("项目ID").Value, Parameters.Item("项目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