Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
844597bf
Commit
844597bf
authored
Jul 28, 2021
by
钟博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改正修改4.1问题导致其他页面缺少数据
parent
aa195381
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
performance/Performance.Api/wwwroot/Performance.Api.xml
+8
-0
performance/Performance.Services/SheetSevice.cs
+10
-4
No files found.
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
844597bf
...
@@ -1378,6 +1378,14 @@
...
@@ -1378,6 +1378,14 @@
</summary>
</summary>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:Performance.Api.Controllers.PersonController.ReloadPersonnel(System.Int32,System.Int32)"
>
<summary>
重新加载人员字典
</summary>
<param
name=
"hospitalId"
></param>
<param
name=
"allotId"
></param>
<returns></returns>
</member>
<member
name=
"T:Performance.Api.Controllers.ReportController"
>
<member
name=
"T:Performance.Api.Controllers.ReportController"
>
<summary>
<summary>
报表
报表
...
...
performance/Performance.Services/SheetSevice.cs
View file @
844597bf
...
@@ -113,7 +113,8 @@ public SheetExportResponse SheetExport(int sheetID)
...
@@ -113,7 +113,8 @@ public SheetExportResponse SheetExport(int sheetID)
}
}
else
else
{
{
CommonExport
(
sheetID
,
response
);
CommonExport
(
sheetID
,
response
,
sheet
.
SheetType
);
//response.Header = response.Header.Select(t => t.Data.ToDistinct(c => c.CellValue)).ToList();
if
(
new
int
[]
{
(
int
)
SheetType
.
Income
,
(
int
)
SheetType
.
OtherIncome
,
(
int
)
SheetType
.
Expend
,
(
int
)
SheetType
.
Workload
}.
Contains
(
sheet
.
SheetType
.
Value
))
if
(
new
int
[]
{
(
int
)
SheetType
.
Income
,
(
int
)
SheetType
.
OtherIncome
,
(
int
)
SheetType
.
Expend
,
(
int
)
SheetType
.
Workload
}.
Contains
(
sheet
.
SheetType
.
Value
))
{
{
var
point
=
0
;
var
point
=
0
;
...
@@ -141,12 +142,17 @@ public SheetExportResponse SheetExport(int sheetID)
...
@@ -141,12 +142,17 @@ public SheetExportResponse SheetExport(int sheetID)
return
response
;
return
response
;
}
}
private
void
CommonExport
(
int
sheetID
,
SheetExportResponse
response
)
private
void
CommonExport
(
int
sheetID
,
SheetExportResponse
response
,
int
?
sheetType
)
{
{
var
headList
=
_perforImHeaderRepository
.
GetEntities
(
t
=>
t
.
SheetID
==
sheetID
)?.
OrderBy
(
t
=>
t
.
PointCell
)
.
ToDistinct
(
t
=>
t
.
CellValue
)
;
var
headList
=
_perforImHeaderRepository
.
GetEntities
(
t
=>
t
.
SheetID
==
sheetID
)?.
OrderBy
(
t
=>
t
.
PointCell
);
if
(
headList
==
null
)
return
;
if
(
headList
==
null
)
return
;
var
dataList
=
_perforImDataRepository
.
GetEntities
(
t
=>
t
.
SheetID
==
sheetID
)?.
OrderByDescending
(
t
=>
t
.
AccountingUnit
).
ToList
();
if
(
sheetType
==
(
int
)
SheetType
.
AccountBasic
)
headList
=
headList
.
ToDistinct
(
t
=>
t
.
CellValue
).
OrderBy
(
t
=>
t
.
PointCell
);
var
dataList
=
_perforImDataRepository
.
GetEntities
(
t
=>
t
.
SheetID
==
sheetID
)?.
OrderByDescending
(
t
=>
t
.
AccountingUnit
).
ToList
();
var
sheet
=
_perforImSheetRepository
.
GetEntity
(
t
=>
t
.
ID
==
sheetID
);
var
sheet
=
_perforImSheetRepository
.
GetEntity
(
t
=>
t
.
ID
==
sheetID
);
//添加系数值
//添加系数值
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment