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
73896ffa
Commit
73896ffa
authored
Dec 04, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
医院其他绩效人员根据工号自动带出、绩效类型字典
parent
46cf14cc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
90 additions
and
4 deletions
+90
-4
performance/Performance.Api/Controllers/EmployeeController.cs
+26
-2
performance/Performance.Api/wwwroot/Performance.Api.xml
+14
-0
performance/Performance.Services/EmployeeService.cs
+49
-2
performance/Performance.Services/PersonService.cs
+1
-0
No files found.
performance/Performance.Api/Controllers/EmployeeController.cs
View file @
73896ffa
...
...
@@ -8,6 +8,7 @@
using
Performance.Infrastructure
;
using
Performance.Services
;
using
System
;
using
System.Collections.Generic
;
using
System.IO
;
using
System.Linq
;
...
...
@@ -427,5 +428,29 @@ public ApiResponse Import([FromForm] IFormCollection form)
employeeService
.
ImpoerAprEmployees
(
allotid
,
path
,
claim
.
GetUserId
());
return
new
ApiResponse
(
ResponseType
.
OK
);
}
/// <summary>
/// 自动获取人员信息
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
(
"autocomplate"
)]
public
ApiResponse
<
per_apr_amount
>
GetEmployeeMessage
(
per_apr_amount
request
)
{
var
result
=
employeeService
.
GetEmployeeMessage
(
request
.
AllotId
,
request
.
PersonnelNumber
);
return
new
ApiResponse
<
per_apr_amount
>(
ResponseType
.
OK
,
""
,
result
);
}
/// <summary>
/// 绩效类型字典
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[
HttpPost
(
"apr/perfortype/{allotId}"
)]
public
ApiResponse
<
List
<
TitleValue
>>
GetPerforTypeDict
(
int
allotId
)
{
var
result
=
employeeService
.
GetPerforTypeDict
(
allotId
);
return
new
ApiResponse
<
List
<
TitleValue
>>(
ResponseType
.
OK
,
""
);
}
}
}
\ No newline at end of file
}
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
73896ffa
...
...
@@ -747,6 +747,20 @@
<param
name=
"form"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.GetEmployeeMessage(Performance.EntityModels.per_apr_amount)"
>
<summary>
自动获取人员信息
</summary>
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.GetPerforTypeDict(System.Int32)"
>
<summary>
绩效类型字典
</summary>
<param
name=
"allotId"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.ExConfigController.Extract(Performance.DtoModels.ModModuleRequest)"
>
<summary>
绩效数据抽取模板
...
...
performance/Performance.Services/EmployeeService.cs
View file @
73896ffa
...
...
@@ -28,6 +28,7 @@ public class EmployeeService : IAutoInjection
private
PerforPerapramountRepository
perapramountRepository
;
private
PerforImemployeelogisticsRepository
perforImemployeelogisticsRepository
;
private
PerforUserroleRepository
userroleRepository
;
private
PerforPeremployeeRepository
peremployeeRepository
;
private
ILogger
<
EmployeeService
>
logger
;
public
EmployeeService
(
PerforImemployeeRepository
perforImemployeeRepository
,
...
...
@@ -39,6 +40,7 @@ public class EmployeeService : IAutoInjection
PerforPerapramountRepository
perapramountRepository
,
PerforImemployeelogisticsRepository
perforImemployeelogisticsRepository
,
PerforUserroleRepository
userroleRepository
,
PerforPeremployeeRepository
peremployeeRepository
,
ILogger
<
EmployeeService
>
logger
)
{
this
.
perforImemployeeRepository
=
perforImemployeeRepository
;
...
...
@@ -50,6 +52,7 @@ public class EmployeeService : IAutoInjection
this
.
perapramountRepository
=
perapramountRepository
;
this
.
perforImemployeelogisticsRepository
=
perforImemployeelogisticsRepository
;
this
.
userroleRepository
=
userroleRepository
;
this
.
peremployeeRepository
=
peremployeeRepository
;
this
.
logger
=
logger
;
}
...
...
@@ -568,5 +571,50 @@ public void ImpoerAprEmployees(int allotid, string path, int userid)
logger
.
LogError
(
ex
.
ToString
());
}
}
/// <summary>
/// 根据人员工号获取人员信息
/// </summary>
/// <param name="allotId"></param>
/// <param name="jobNumber"></param>
/// <returns></returns>
public
per_apr_amount
GetEmployeeMessage
(
int
allotId
,
string
jobNumber
)
{
if
(
string
.
IsNullOrEmpty
(
jobNumber
))
return
new
per_apr_amount
();
var
employee
=
peremployeeRepository
.
GetEntity
(
w
=>
w
.
AllotId
==
allotId
&&
w
.
JobNumber
.
Trim
()
==
jobNumber
.
Trim
());
if
(
employee
==
null
)
return
new
per_apr_amount
();
return
new
per_apr_amount
{
AllotId
=
allotId
,
PersonnelNumber
=
employee
.
JobNumber
,
DoctorName
=
employee
.
DoctorName
,
TypeInDepartment
=
employee
.
Department
,
AccountingUnit
=
employee
.
AccountingUnit
};
}
/// <summary>
/// 获取绩效类型字典
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
public
List
<
TitleValue
>
GetPerforTypeDict
(
int
allotId
)
{
var
defaultTypes
=
new
List
<
string
>
{
"基础绩效"
,
"管理绩效"
};
var
aprAmountList
=
perapramountRepository
.
GetEntities
(
w
=>
w
.
AllotId
==
allotId
);
if
(
aprAmountList
!=
null
&&
aprAmountList
.
Any
(
w
=>
!
defaultTypes
.
Contains
(
w
.
PerforType
)))
{
var
savedTypes
=
aprAmountList
.
Where
(
w
=>
!
defaultTypes
.
Contains
(
w
.
PerforType
)).
Select
(
t
=>
t
.
PerforType
).
Distinct
().
OrderBy
(
t
=>
t
).
ToList
();
defaultTypes
.
AddRange
(
savedTypes
);
}
return
defaultTypes
.
Select
(
t
=>
new
TitleValue
{
Title
=
t
,
Value
=
t
}).
ToList
();
}
}
}
\ No newline at end of file
}
performance/Performance.Services/PersonService.cs
View file @
73896ffa
...
...
@@ -26,6 +26,7 @@ public class PersonService : IAutoInjection
private
readonly
PerforRoleRepository
perforRoleRepository
;
private
readonly
PerforAgsecondallotRepository
agsecondallotRepository
;
private
readonly
Application
application
;
private
readonly
Dictionary
<
string
,
(
string
,
string
)>
dict
=
new
Dictionary
<
string
,
(
string
,
string
)>
{
{
nameof
(
DeptdicResponse
.
OutDoctorAccounting
),
(
UnitType
.
医生组
.
ToString
(),
"门诊"
)
},
...
...
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