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
c38d1132
Commit
c38d1132
authored
Sep 28, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
医院其他绩效审核
parent
209c0c0e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
12 deletions
+18
-12
performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs
+1
-2
performance/Performance.Services/ConfigService.cs
+1
-0
performance/Performance.Services/EmployeeService.cs
+16
-10
No files found.
performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs
View file @
c38d1132
...
...
@@ -8,7 +8,7 @@ namespace Performance.DtoModels
public
class
AprAmountAuditRequest
{
/// <summary> 二次绩效Id </summary>
public
int
Id
{
get
;
set
;
}
public
int
[]
Id
{
get
;
set
;
}
/// <summary> 审核结果 1、审核通过 2、驳回 </summary>
public
int
IsPass
{
get
;
set
;
}
...
...
@@ -20,7 +20,6 @@ public class AprAmountAuditRequestValidator : AbstractValidator<AprAmountAuditRe
{
public
AprAmountAuditRequestValidator
()
{
RuleFor
(
x
=>
x
.
Id
).
NotNull
().
NotEmpty
().
GreaterThan
(
0
);
RuleFor
(
x
=>
x
.
IsPass
).
NotNull
().
NotEmpty
().
InclusiveBetween
(
1
,
2
);
}
}
...
...
performance/Performance.Services/ConfigService.cs
View file @
c38d1132
...
...
@@ -792,6 +792,7 @@ private void CopyAprData(int prevAllotId, int allotId)
{
var
data
=
list
.
Select
(
t
=>
new
per_apr_amount
{
Status
=
2
,
AllotId
=
allotId
,
PersonnelNumber
=
t
.
PersonnelNumber
,
DoctorName
=
t
.
DoctorName
,
...
...
performance/Performance.Services/EmployeeService.cs
View file @
c38d1132
...
...
@@ -391,7 +391,7 @@ public bool InsertApr(per_apr_amount request, int userId)
//var data = perapramountRepository.GetEntity(t => t.PersonnelNumber == request.PersonnelNumber && t.AllotId == request.AllotId);
//if (data != null)
// throw new PerformanceException("人员工号已存在");
request
.
Status
=
2
;
request
.
CreateDate
=
DateTime
.
Now
;
request
.
CreateUser
=
userId
;
return
perapramountRepository
.
Add
(
request
);
...
...
@@ -406,6 +406,7 @@ public bool UpdateApr(per_apr_amount request)
if
(
data
==
null
)
throw
new
PerformanceException
(
"修改数据无效"
);
data
.
Status
=
2
;
data
.
PersonnelNumber
=
request
.
PersonnelNumber
;
data
.
DoctorName
=
request
.
DoctorName
;
data
.
PerforType
=
request
.
PerforType
;
...
...
@@ -433,15 +434,19 @@ public bool DeleteApr(int id)
/// <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
);
if
(
request
.
Id
.
Length
==
0
)
throw
new
PerformanceException
(
"审核信息无效,请确认"
);
var
apramounts
=
perapramountRepository
.
GetEntities
(
t
=>
request
.
Id
.
Contains
(
t
.
Id
));
foreach
(
var
item
in
apramounts
)
{
item
.
Status
=
(
request
.
IsPass
==
1
)
?
3
:
4
;
item
.
AuditUser
=
userid
;
item
.
AuditTime
=
DateTime
.
Now
;
item
.
Remark
=
request
.
Remark
;
}
return
perapramountRepository
.
UpdateRange
(
apramounts
.
ToArray
());
}
public
void
ImpoerAprEmployees
(
int
allotid
,
string
path
,
int
userid
)
...
...
@@ -504,6 +509,7 @@ public void ImpoerAprEmployees(int allotid, string path, int userid)
var
entity
=
new
per_apr_amount
{
Status
=
2
,
PersonnelNumber
=
row
.
GetCell
(
dict
[
"人员工号"
]).
GetValue
(),
DoctorName
=
row
.
GetCell
(
dict
[
"姓名"
]).
GetValue
(),
PerforType
=
row
.
GetCell
(
dict
[
"绩效类型"
]).
GetValue
(),
...
...
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