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
985ee9f6
Commit
985ee9f6
authored
Mar 30, 2022
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员标签备用
parent
2458960b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
44 additions
and
103 deletions
+44
-103
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+0
-7
performance/Performance.DtoModels/HandsonTable.cs
+0
-6
performance/Performance.DtoModels/Response/PerEmployeeResponse.cs
+0
-5
performance/Performance.EntityModels/Entity/per_employee.cs
+10
-0
performance/Performance.Services/ComputeConfig.cs
+0
-0
performance/Performance.Services/ComputeService.cs
+0
-0
performance/Performance.Services/PersonService.cs
+2
-28
performance/Performance.Services/ReportGlobalService.cs
+32
-57
No files found.
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
985ee9f6
...
...
@@ -205,13 +205,6 @@
<member
name=
"F:Performance.DtoModels.DataFormat.日期"
>
<summary>
日期
</summary>
</member>
<member
name=
"M:Performance.DtoModels.HandsonTable.SetRowData(System.Collections.Generic.IEnumerable{Performance.DtoModels.HandsonRowData},System.Boolean)"
>
<summary>
</summary>
<param
name=
"datas"
></param>
<param
name=
"isTypein"
>
是否是用户录入的 是:true 不是:false
</param>
</member>
<member
name=
"P:Performance.DtoModels.HistoryData.Year"
>
<summary>
年
...
...
performance/Performance.DtoModels/HandsonTable.cs
View file @
985ee9f6
...
...
@@ -37,12 +37,6 @@ public HandsonTable(int sheetType, string[] cols, List<collect_permission> permi
InitColumns
(
permissions
);
}
/// <summary>
///
/// </summary>
/// <param name="datas"></param>
/// <param name="isTypein">是否是用户录入的 是:true 不是:false</param>
public
void
SetRowData
(
IEnumerable
<
HandsonRowData
>
datas
,
bool
isTypein
)
{
foreach
(
var
dt
in
datas
)
...
...
performance/Performance.DtoModels/Response/PerEmployeeResponse.cs
View file @
985ee9f6
...
...
@@ -18,9 +18,4 @@ public class PerEmployeeResponse : per_employee
/// </summary>
public
new
string
BirthDate
{
get
;
set
;
}
}
public
class
PersonePassword
:
per_employee
{
public
string
Password
{
get
;
set
;
}
}
}
performance/Performance.EntityModels/Entity/per_employee.cs
View file @
985ee9f6
...
...
@@ -150,5 +150,15 @@ public class per_employee
///
/// </summary>
public
Nullable
<
int
>
CreateUser
{
get
;
set
;
}
public
string
Reserve01
{
get
;
set
;
}
public
string
Reserve02
{
get
;
set
;
}
public
string
Reserve03
{
get
;
set
;
}
public
string
Reserve04
{
get
;
set
;
}
public
string
Reserve05
{
get
;
set
;
}
public
string
Reserve06
{
get
;
set
;
}
public
string
Reserve07
{
get
;
set
;
}
public
string
Reserve08
{
get
;
set
;
}
public
string
Reserve09
{
get
;
set
;
}
public
string
Reserve10
{
get
;
set
;
}
}
}
performance/Performance.Services/ComputeConfig.cs
0 → 100644
View file @
985ee9f6
This diff is collapsed.
Click to expand it.
performance/Performance.Services/ComputeService.cs
View file @
985ee9f6
This diff is collapsed.
Click to expand it.
performance/Performance.Services/PersonService.cs
View file @
985ee9f6
...
...
@@ -718,17 +718,8 @@ private string[] GetUnitType(int userId)
public
HandsonTable
GetBatchPersonStructrue
(
int
hospitalId
)
{
var
hos
=
perforHospitalRepository
.
GetEntity
(
t
=>
t
.
ID
==
hospitalId
);
var
cols
=
hos
.
IsOwnerQuery
==
1
?
PersonPassword
.
Select
(
t
=>
t
.
Item2
).
ToArray
()
:
Person
.
Select
(
t
=>
t
.
Item2
).
ToArray
();
var
permissions
=
hos
.
IsOwnerQuery
==
1
?
PersonPassword
.
Select
(
t
=>
new
collect_permission
{
HeadName
=
t
.
Item2
,
Visible
=
1
}).
ToList
()
:
Person
.
Select
(
t
=>
new
collect_permission
{
HeadName
=
t
.
Item2
,
Visible
=
1
}).
ToList
();
var
cols
=
Person
.
Select
(
t
=>
t
.
Item2
).
ToArray
();
var
permissions
=
Person
.
Select
(
t
=>
new
collect_permission
{
HeadName
=
t
.
Item2
,
Visible
=
1
}).
ToList
();
var
result
=
new
HandsonTable
((
int
)
SheetType
.
Unidentifiable
,
cols
,
permissions
);
var
deptdics
=
perdeptdicRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
hospitalId
);
...
...
@@ -1073,23 +1064,6 @@ private void DeptDicList(int HospitalId, List<per_dept_dic> deptDics, DeptdicHan
return
result
;
}
public
static
List
<(
string
,
string
,
Func
<
PersonePassword
,
object
>)>
PersonPassword
{
get
;
}
=
new
List
<(
string
,
string
,
Func
<
PersonePassword
,
object
>)>
{
(
nameof
(
PersonePassword
.
UnitType
),
"核算组别"
,
t
=>
t
.
UnitType
),
(
nameof
(
PersonePassword
.
AccountingUnit
),
"核算单元"
,
t
=>
t
.
AccountingUnit
),
(
nameof
(
PersonePassword
.
Department
),
"科室名称"
,
t
=>
t
.
Department
),
(
nameof
(
PersonePassword
.
DoctorName
),
"姓名"
,
t
=>
t
.
DoctorName
),
(
nameof
(
PersonePassword
.
PersonnelNumber
),
"员工工号"
,
t
=>
t
.
PersonnelNumber
),
//(nameof(PersonePassword.JobCategory), "正式/临聘", t => t.JobCategory),
//(nameof(PersonePassword.Duty), "职务", t => t.Duty),
//(nameof(PersonePassword.JobTitle), "职称", t => t.JobTitle),
//(nameof(PersonePassword.AttendanceDay), "出勤天数", t => t.AttendanceDay),
//(nameof(PersonePassword.ReservedRatio), "预留比例", t => t.ReservedRatio),
//(nameof(PersonePassword.BankCard), "银行卡号", t => t.BankCard),
//(nameof(PersonePassword.Password), "密码", t => t.Password),
//(nameof(PersonePassword.Remark), "备注", t => t.Remark),
};
public
static
List
<(
string
,
string
,
Func
<
per_employee
,
object
>)>
Person
{
get
;
}
=
new
List
<(
string
,
string
,
Func
<
per_employee
,
object
>)>
{
(
nameof
(
per_employee
.
UnitType
),
"核算组别"
,
t
=>
t
.
UnitType
),
...
...
performance/Performance.Services/ReportGlobalService.cs
View file @
985ee9f6
This diff is collapsed.
Click to expand it.
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