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
3ce206f8
Commit
3ce206f8
authored
Nov 12, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
其他绩效审核状态,及审核
parent
d62de023
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
performance/Performance.Api/Controllers/EmployeeController.cs
+2
-2
performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs
+4
-0
performance/Performance.Services/ExtractExcelService/ExtractService.cs
+2
-1
No files found.
performance/Performance.Api/Controllers/EmployeeController.cs
View file @
3ce206f8
...
...
@@ -287,8 +287,7 @@ public ApiResponse GetAprGroupList([FromBody] per_apr_amount request)
{
AccountingUnit
=
t
.
Key
.
AccountingUnit
,
TypeInDepartment
=
t
.
Key
.
TypeInDepartment
,
Amount
=
t
.
Sum
(
s
=>
s
.
Amount
??
0
),
Status
=
t
.
Any
(
s
=>
s
.
Status
==
2
)
?
2
:
t
.
Any
(
s
=>
s
.
Status
==
4
)
?
4
:
t
.
FirstOrDefault
().
Status
Amount
=
t
.
Sum
(
s
=>
s
.
Amount
??
0
)
});
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
result
);
}
...
...
@@ -313,6 +312,7 @@ public ApiResponse GetAprDetail([FromBody] per_apr_amount request)
{
PersonnelNumber
=
t
.
Key
.
PersonnelNumber
,
DoctorName
=
t
.
Key
.
DoctorName
,
Status
=
t
.
Any
(
s
=>
s
.
Status
==
2
)
?
2
:
t
.
Any
(
s
=>
s
.
Status
==
4
)
?
4
:
t
.
FirstOrDefault
().
Status
,
Detail
=
t
.
GroupBy
(
group
=>
group
.
PerforType
).
Select
(
s
=>
new
TitleValue
<
decimal
>
{
Title
=
s
.
Key
,
...
...
performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs
View file @
3ce206f8
...
...
@@ -10,6 +10,10 @@ public class AprAmountAuditRequest
/// <summary> 二次绩效Id </summary>
public
int
[]
Id
{
get
;
set
;
}
public
string
PersonnelNumber
{
get
;
set
;
}
public
string
DoctorName
{
get
;
set
;
}
/// <summary> 审核结果 1、审核通过 2、驳回 </summary>
public
int
IsPass
{
get
;
set
;
}
...
...
performance/Performance.Services/ExtractExcelService/ExtractService.cs
View file @
3ce206f8
...
...
@@ -111,6 +111,7 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD
var
collectData
=
collectdataRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
allotId
);
WriteDataFactory
factory
=
new
WriteDataFactory
();
var
types
=
new
List
<
SheetType
>
{
SheetType
.
OtherIncome
,
SheetType
.
Income
,
SheetType
.
Expend
,
SheetType
.
Workload
};
for
(
int
sheetIndex
=
0
;
sheetIndex
<
workbook
.
NumberOfSheets
;
sheetIndex
++)
{
var
sheet
=
workbook
.
GetSheetAt
(
sheetIndex
);
...
...
@@ -119,7 +120,7 @@ private void WriteDataToFile(IWorkbook workbook, int allotId, Dictionary<ExDataD
if
(
sheetType
==
SheetType
.
Unidentifiable
)
continue
;
var
point
=
PerSheetDataFactory
.
GetDataRead
(
sheetType
)?.
Point
;
if
(
point
!=
null
&&
point
.
DataFirstCellNum
.
HasValue
)
if
(
types
.
Contains
(
sheetType
)
&&
point
!=
null
&&
point
.
DataFirstCellNum
.
HasValue
)
ExtractHelper
.
ClearSheetPartialData
(
sheet
,
point
,
sheetType
);
var
customer
=
factory
.
GetWriteData
(
sheetType
);
...
...
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