From 80753057b34160045c6ae8be6fd21b5accb295c5 Mon Sep 17 00:00:00 2001 From: cuckooent Date: Thu, 31 Oct 2024 18:20:13 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"=E6=9B=B4=E6=96=B0=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8","MessageType":2,"Modules":[{"State":1,"Type":18,"Nam?= =?UTF-8?q?e":"RdlReport/=E4=BA=BA=E5=91=98=E5=B7=A5=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +----------- Reports/人员工时报表.json | 32 +++++++++++++++++++++----------- Reports/人员工时报表.rdlx | 11 +++++++++-- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.collaboration b/.collaboration index ad7d8582..c048255e 100644 --- a/.collaboration +++ b/.collaboration @@ -2470,17 +2470,7 @@ }, { "ModuleName": "RdlReport/人员工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-31T17:56:18.0663194+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\人员工时报表.json", - "Reports\\人员工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/客户工时报表", diff --git a/Reports/人员工时报表.json b/Reports/人员工时报表.json index c3ba804b..b5aebc27 100644 --- a/Reports/人员工时报表.json +++ b/Reports/人员工时报表.json @@ -8,7 +8,7 @@ "TableName": "View_任务工时统计", "BindingInfos": [ { - "GUID": "78916e3c-a199-4f3c-a905-35cff4e75a52", + "GUID": "ebf3651b-bea1-41e4-87a5-bc7ad2d8406c", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "日期", @@ -17,7 +17,7 @@ "ColumnName": "日期" }, { - "GUID": "8907db31-f792-4c61-a8db-41995d4a1b16", + "GUID": "f723980a-2252-4da3-8e42-49d493b7c967", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -30,7 +30,7 @@ "ColumnName": "执行人" }, { - "GUID": "5a75edee-d20a-4544-81ad-291700f6fa32", + "GUID": "261a4ba1-d7fe-4588-9ae8-846eb072ee26", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", @@ -39,7 +39,7 @@ "ColumnName": "执行人用户名" }, { - "GUID": "2eadb98b-06f7-4c53-bb8b-0f187ab9eb3f", + "GUID": "491b6334-20fc-411d-ba83-368166872308", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", @@ -48,7 +48,7 @@ "ColumnName": "项目ID" }, { - "GUID": "d7513c18-056f-46d3-a767-4a46bf0d290d", + "GUID": "01a76667-38cc-4706-9a95-f8a0ef48b2a4", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "项目ID", @@ -62,7 +62,7 @@ "ColumnName": "项目" }, { - "GUID": "d065c44b-0cfd-4a77-a8f1-38a48ee82e7a", + "GUID": "85d10acc-81a3-4438-8229-3fc25e780787", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -76,7 +76,7 @@ "ColumnName": "版本ID" }, { - "GUID": "280e9f47-a76b-4de2-b741-c6d64d64f18d", + "GUID": "09a9c277-3dd6-459e-beed-8a69624c6a29", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -95,7 +95,7 @@ "ColumnName": "版本名称" }, { - "GUID": "75856aa4-bdae-44d7-a6cf-9b9b15786fd1", + "GUID": "943dc74c-cee5-4bf6-9bd6-d42b3cd41fd5", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务ID", @@ -104,7 +104,7 @@ "ColumnName": "任务ID" }, { - "GUID": "e918d162-557b-41b2-8f1e-3b473e6e9f3f", + "GUID": "afc92ec4-91c9-472b-8051-aa8ec69140f1", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "任务名称", @@ -113,7 +113,16 @@ "ColumnName": "任务名称" }, { - "GUID": "4b8229cb-89da-476e-96d4-5ffe10822285", + "GUID": "426d3d29-c2e2-416d-bc7c-c45708a47094", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行内容", + "GUID": "a5ed5fe3-b7a4-4740-9aca-270f6b6600de" + }, + "ColumnName": "执行内容" + }, + { + "GUID": "c8f5f2e0-a395-4fb1-b682-e7903bc948d5", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "上报工时", @@ -122,7 +131,7 @@ "ColumnName": "上报工时" }, { - "GUID": "2ffd878d-00a1-457a-b814-dc04ebb5063d", + "GUID": "608170b7-8c84-4362-b20d-37d99be25c55", "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "核定工时", @@ -164,6 +173,7 @@ "string", "integer", "string", + "string", "number", "number" ] diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx index e91d0de0..bea3c57b 100644 --- a/Reports/人员工时报表.rdlx +++ b/Reports/人员工时报表.rdlx @@ -1,4 +1,11 @@ -人员工时报表.rdlx8cm0cm0cm40cm6.75cm工时表_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!项目.ValueTrueRestrictedtrue版本=Fields!版本名称.ValueTrueRestricted2true任务=Fields.Item("任务名称").Valuetrue上报工时=Fields.Item("上报工时").Valuetrue核定工时=Fields.Item("核定工时").Value
1cm4true合计true文本框45=Sum(Fields!上报工时.Value)true文本框46=Sum(Fields!核定工时.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
0.75cm4true项目小计true=Sum(Fields!上报工时.Value)true=Sum(Fields!核定工时.Value)
=Fields!项目ID.Value
6.75cm0cm40cm1.25cm1true +人员工时报表.rdlx1cmtruetrue0cm0cm7.5cm1cmtrue b89954dd-a360-4909-926a-34ae179f314f 空白样式 -="第 " & Globals!PageNumber & " 页 共 " & Globals!TotalPages & " 页"1cmtruetrue1cm1cm29.7cm42cm1cm1cm40cmDateTimetrueTrueDateTimetrue结束日期TrueIntegertrue项目IDTrue项目表_DataSet项目名称IDIntegertrue版本IDTrue版本表_DataSet名称加版本号IDString执行人Truetrue用户信息视图_DataSet全名用户名用户信息视图_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!日期.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)In$.[*]工时表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 +Clue&有绪0cm32.501cm7.5cm1cm1true + b89954dd-a360-4909-926a-34ae179f314f + 空白样式 +理清头绪 · 形成秩序 · 实现持续 +7.5cm0cm0cm39.818cm7.5cm工时表_DataSet人员工时报表Auto
true2.25cm6true=" " & Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "人员工时统计表"1cmtrue文本框1项目true文本框12版本true文本框2任务true执行内容true文本框17上报工时true文本框21核定工时
=Fields!日期.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("版本名称").ValueTrueRestrictedtrue任务=Fields.Item("任务名称").Valuetrue执行内容=Fields!执行内容.Valuetrue上报工时=Fields.Item("上报工时").Valuetrue核定工时=Fields.Item("核定工时").Value
1cm4true合计true文本框45=Sum(Fields!上报工时.Value)true文本框46=Sum(Fields!核定工时.Value)
4.5cm3.5cm6.001cm17.999cm3.907cm3.911cm
true1cmtrue=Fields.Item("执行人").Value & " "3true小计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
=Fields.Item("执行人").Value
true0.75cmtruetruetruetruetruetruetrue
0.75cmtruetruetruetrue项目小计true=Sum(Fields!上报工时.Value)true=Sum(Fields!核定工时.Value)
=Fields!项目ID.Value
1.25cmtruetrue0cm0cm40cm1.25cmtrue + b89954dd-a360-4909-926a-34ae179f314f + 空白样式 +="第 " & Globals!PageNumber & " 页 共 " & Globals!TotalPages & " 页"1cm1cm29.7cm42cm1cm1cm39.818cmDateTimetrueTrueDateTimetrue结束日期TrueIntegertrue项目IDTrue项目表_DataSet项目名称IDIntegertrue版本IDTrue版本表_DataSet名称加版本号IDString执行人Truetrue用户信息视图_DataSet全名用户名用户信息视图_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":"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!日期.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)In$.[*]工时表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