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
625ec8e8
Commit
625ec8e8
authored
Nov 03, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
读取实发绩效
parent
1be6d94b
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
0 deletions
+12
-0
performance/Performance.DtoModels/PerExcel/PerDataClinicEmployee.cs
+1
-0
performance/Performance.DtoModels/PerExcel/PerDataEmployee.cs
+1
-0
performance/Performance.DtoModels/PerExcel/PerDataLogisticsEmployee.cs
+2
-0
performance/Performance.EntityModels/Entity/im_accountbasic.cs
+1
-0
performance/Performance.EntityModels/Entity/im_employee.cs
+1
-0
performance/Performance.EntityModels/Entity/im_employee_clinic.cs
+1
-0
performance/Performance.EntityModels/Entity/im_employee_logistics.cs
+1
-0
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
+4
-0
No files found.
performance/Performance.DtoModels/PerExcel/PerDataClinicEmployee.cs
View file @
625ec8e8
...
...
@@ -130,5 +130,6 @@ public class PerDataClinicEmployee : IPerData
/// 行号
/// </summary>
public
int
RowNumber
{
get
;
set
;
}
public
Nullable
<
decimal
>
RealGiveFee
{
get
;
set
;
}
}
}
performance/Performance.DtoModels/PerExcel/PerDataEmployee.cs
View file @
625ec8e8
...
...
@@ -120,5 +120,6 @@ public class PerDataEmployee : IPerData
/// 行号
/// </summary>
public
int
RowNumber
{
get
;
set
;
}
public
Nullable
<
decimal
>
RealGiveFee
{
get
;
set
;
}
}
}
performance/Performance.DtoModels/PerExcel/PerDataLogisticsEmployee.cs
View file @
625ec8e8
...
...
@@ -75,6 +75,8 @@ public class PerDataLogisticsEmployee : IPerData
/// 行号
/// </summary>
public
int
RowNumber
{
get
;
set
;
}
public
Nullable
<
decimal
>
RealGiveFee
{
get
;
set
;
}
}
}
performance/Performance.EntityModels/Entity/im_accountbasic.cs
View file @
625ec8e8
...
...
@@ -230,5 +230,6 @@ public class im_accountbasic
/// 调节后其他绩效
/// </summary>
public
Nullable
<
decimal
>
AdjustLaterOtherFee
{
get
;
set
;
}
public
Nullable
<
decimal
>
RealGiveFee
{
get
;
set
;
}
}
}
performance/Performance.EntityModels/Entity/im_employee.cs
View file @
625ec8e8
...
...
@@ -175,5 +175,6 @@ public class im_employee
/// 调节后其他绩效
/// </summary>
public
Nullable
<
decimal
>
AdjustLaterOtherFee
{
get
;
set
;
}
public
Nullable
<
decimal
>
RealGiveFee
{
get
;
set
;
}
}
}
performance/Performance.EntityModels/Entity/im_employee_clinic.cs
View file @
625ec8e8
...
...
@@ -175,5 +175,6 @@ public class im_employee_clinic
/// 调节后其他绩效
/// </summary>
public
Nullable
<
decimal
>
AdjustLaterOtherFee
{
get
;
set
;
}
public
Nullable
<
decimal
>
RealGiveFee
{
get
;
set
;
}
}
}
performance/Performance.EntityModels/Entity/im_employee_logistics.cs
View file @
625ec8e8
...
...
@@ -130,5 +130,6 @@ public class im_employee_logistics
/// 是否需要二次分配
/// </summary>
public
string
NeedSecondAllot
{
get
;
set
;
}
public
Nullable
<
decimal
>
RealGiveFee
{
get
;
set
;
}
}
}
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
View file @
625ec8e8
...
...
@@ -27,6 +27,7 @@ public class ExcelReadConfig
new
ColumnInfo
(
nameof
(
PerDataEmployee
.
Attendance
),
"出勤率"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataEmployee
.
Adjust
),
"调节系数"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataEmployee
.
AdjustLaterOtherFee
),
"调节后其他绩效"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataEmployee
.
RealGiveFee
),
"实发绩效"
,
true
),
};
...
...
@@ -54,6 +55,7 @@ public class ExcelReadConfig
//new ColumnInfo(nameof(PerDataClinicEmployee.NightWorkPerfor), "夜班费"),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Adjust
),
"调节系数"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
AdjustLaterOtherFee
),
"调节后其他绩效"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
RealGiveFee
),
"实发绩效"
,
true
),
};
...
...
@@ -72,6 +74,7 @@ public class ExcelReadConfig
new
ColumnInfo
(
nameof
(
PerDataLogisticsEmployee
.
OthePerfor
),
"其他绩效"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataLogisticsEmployee
.
NeedSecondAllot
),
"是否需要二次分配"
),
//new ColumnInfo(nameof(PerDataLogisticsEmployee.AdjustLaterOtherFee), "调节后其他绩效", true),
new
ColumnInfo
(
nameof
(
PerDataLogisticsEmployee
.
RealGiveFee
),
"实发绩效"
,
true
),
};
public
static
ColumnInfo
[]
AccountBaisc
{
get
;
set
;
}
=
new
ColumnInfo
[]
...
...
@@ -90,6 +93,7 @@ public class ExcelReadConfig
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
AssessLaterOtherFee
),
"考核后其他绩效"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
AdjustFactor
),
"调节系数"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
AdjustLaterOtherFee
),
"调节后其他绩效"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
RealGiveFee
),
"实发绩效"
,
true
),
};
}
...
...
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