diff --git a/.collaboration b/.collaboration
index b3b716e7..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:24:40.3334777+08:00",
- "ModuleType": 18,
- "ToRemoveFiles": [
- "Reports\\人员工时报表.json",
- "Reports\\人员工时报表.rdlx"
- ]
+ "ModuleType": 18
},
{
"ModuleName": "RdlReport/客户工时报表",
diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx
index d0200a70..e91d0de0 100644
--- a/Reports/人员工时报表.rdlx
+++ b/Reports/人员工时报表.rdlx
@@ -1,4 +1,4 @@
-人员工时报表.rdlx6cm0cm0cm40cm6cm工时表_DataSet人员工时报表Autotrue2.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 8.372cm7.063cm7.816cm8.931cm3.907cm3.911cmtrue1cmtrue=Fields.Item("执行人").Value & " "3true小计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)=Fields.Item("执行人").Value
1cmtruetrue0cm0cm40cm1cmtrue
+人员工时报表.rdlx8cm0cm0cm40cm6.75cm工时表_DataSet人员工时报表Autotrue2.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 8.372cm7.063cm7.816cm8.931cm3.907cm3.911cmtrue1cmtrue=Fields.Item("执行人").Value & " "3true小计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)=Fields.Item("执行人").Value=Fields!项目ID.Value
6.75cm0cm40cm1.25cm1true
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"}}}}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 & " 页"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