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
9cd57574
Commit
9cd57574
authored
Sep 27, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审核医院其他绩效
parent
ceb22f94
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
114 additions
and
0 deletions
+114
-0
performance/Performance.Api/Controllers/EmployeeController.cs
+13
-0
performance/Performance.Api/wwwroot/Performance.Api.xml
+6
-0
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+9
-0
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+20
-0
performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs
+27
-0
performance/Performance.EntityModels/Entity/per_apr_amount.cs
+20
-0
performance/Performance.Services/EmployeeService.cs
+19
-0
No files found.
performance/Performance.Api/Controllers/EmployeeController.cs
View file @
9cd57574
...
...
@@ -320,6 +320,19 @@ public ApiResponse DeleteApr([FromBody] per_apr_amount request)
}
/// <summary>
/// 医院其他绩效审核;驳回、成功
/// </summary>
/// <returns></returns>
[
HttpPost
]
[
Route
(
"apr/audit"
)]
public
ApiResponse
AuditResult
([
FromBody
]
AprAmountAuditRequest
request
)
{
var
userid
=
claim
.
GetUserId
();
var
result
=
employeeService
.
ConfirmAudit
(
userid
,
request
);
return
result
?
new
ApiResponse
(
ResponseType
.
OK
,
"操作成功"
)
:
new
ApiResponse
(
ResponseType
.
Fail
,
"操作失败"
);
}
/// <summary>
/// 上传人员绩效文件
/// </summary>
/// <param name="form"></param>
...
...
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
9cd57574
...
...
@@ -654,6 +654,12 @@
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.AuditResult(Performance.DtoModels.AprAmountAuditRequest)"
>
<summary>
医院其他绩效审核;驳回、成功
</summary>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.Import(Microsoft.AspNetCore.Http.IFormCollection)"
>
<summary>
上传人员绩效文件
...
...
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
9cd57574
...
...
@@ -1581,6 +1581,15 @@
路径
</summary>
</member>
<member
name=
"P:Performance.DtoModels.AprAmountAuditRequest.Id"
>
<summary>
二次绩效Id
</summary>
</member>
<member
name=
"P:Performance.DtoModels.AprAmountAuditRequest.IsPass"
>
<summary>
审核结果 1、审核通过 2、驳回
</summary>
</member>
<member
name=
"P:Performance.DtoModels.AprAmountAuditRequest.Remark"
>
<summary>
备注
</summary>
</member>
<member
name=
"P:Performance.DtoModels.Request.SmsCodeRequest.Type"
>
<summary>
短信验证类型 1 手机号登录 2 其他
...
...
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
9cd57574
...
...
@@ -2962,6 +2962,26 @@
核算单元
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.Status"
>
<summary>
状态 1 未提交 2 等待审核 3 审核通过 4 驳回
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.AuditTime"
>
<summary>
审核时间
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.AuditUser"
>
<summary>
审核人
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.Remark"
>
<summary>
备注
</summary>
</member>
<member
name=
"P:Performance.EntityModels.per_apr_amount.CreateDate"
>
<summary>
...
...
performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs
0 → 100644
View file @
9cd57574
using
FluentValidation
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Performance.DtoModels
{
public
class
AprAmountAuditRequest
{
/// <summary> 二次绩效Id </summary>
public
int
Id
{
get
;
set
;
}
/// <summary> 审核结果 1、审核通过 2、驳回 </summary>
public
int
IsPass
{
get
;
set
;
}
/// <summary> 备注 </summary>
public
string
Remark
{
get
;
set
;
}
}
public
class
AprAmountAuditRequestValidator
:
AbstractValidator
<
AprAmountAuditRequest
>
{
public
AprAmountAuditRequestValidator
()
{
RuleFor
(
x
=>
x
.
Id
).
NotNull
().
NotEmpty
().
GreaterThan
(
0
);
RuleFor
(
x
=>
x
.
IsPass
).
NotNull
().
NotEmpty
().
InclusiveBetween
(
1
,
2
);
}
}
}
performance/Performance.EntityModels/Entity/per_apr_amount.cs
View file @
9cd57574
...
...
@@ -57,6 +57,26 @@ public class per_apr_amount
public
string
AccountingUnit
{
get
;
set
;
}
/// <summary>
/// 状态 1 未提交 2 等待审核 3 审核通过 4 驳回
/// </summary>
public
int
Status
{
get
;
set
;
}
/// <summary>
/// 审核时间
/// </summary>
public
Nullable
<
DateTime
>
AuditTime
{
get
;
set
;
}
/// <summary>
/// 审核人
/// </summary>
public
Nullable
<
int
>
AuditUser
{
get
;
set
;
}
/// <summary>
/// 备注
/// </summary>
public
string
Remark
{
get
;
set
;
}
/// <summary>
///
/// </summary>
public
Nullable
<
DateTime
>
CreateDate
{
get
;
set
;
}
...
...
performance/Performance.Services/EmployeeService.cs
View file @
9cd57574
...
...
@@ -425,6 +425,25 @@ public bool DeleteApr(int id)
return
true
;
}
/// <summary>
/// 审核医院其他绩效
/// </summary>
/// <param name="userid"></param>
/// <param name="request"></param>
/// <returns></returns>
public
bool
ConfirmAudit
(
int
userid
,
AprAmountAuditRequest
request
)
{
var
apramount
=
perapramountRepository
.
GetEntity
(
t
=>
t
.
Id
==
request
.
Id
);
if
(
apramount
.
Status
!=
2
)
throw
new
PerformanceException
(
"该绩效未提交至审核,请确认"
);
apramount
.
Status
=
(
request
.
IsPass
==
1
)
?
3
:
4
;
apramount
.
AuditUser
=
userid
;
apramount
.
AuditTime
=
DateTime
.
Now
;
apramount
.
Remark
=
request
.
Remark
;
return
perapramountRepository
.
Update
(
apramount
);
}
public
void
ImpoerAprEmployees
(
int
allotid
,
string
path
,
int
userid
)
{
var
data
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotid
);
...
...
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