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
58138c57
Commit
58138c57
authored
Mar 13, 2020
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
其他来源数据修改
parent
eb1dd67f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
performance/Performance.Services/SecondAllotService.cs
+11
-3
No files found.
performance/Performance.Services/SecondAllotService.cs
View file @
58138c57
...
...
@@ -112,7 +112,8 @@ public List<SecondListResponse> GetSecondList(int userId)
Month
=
allot
.
Month
,
Department
=
user
.
Department
,
UnitType
=
((
UnitType
)
account
.
UnitType
).
ToString
(),
RealGiveFee
=
account
.
RealGiveFee
RealGiveFee
=
account
.
RealGiveFee
,
Status
=
1
};
newSecond
.
Add
(
second
);
}
...
...
@@ -291,7 +292,7 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
{
HeadItems
=
result
.
HeadItems
.
OrderBy
(
t
=>
t
.
Type
).
ThenBy
(
t
=>
t
.
Sort
).
ThenBy
(
t
=>
t
.
FiledName
).
ToList
(),
BodyItems
=
result
.
BodyItems
.
OrderBy
(
t
=>
t
.
RowNumber
).
ThenBy
(
t
=>
t
.
Type
).
ThenBy
(
t
=>
t
.
Sort
).
ToList
(),
};
;
};
}
/// <summary>
...
...
@@ -539,7 +540,8 @@ public bool UseTemp(UseTempRequest request)
var
addList
=
new
List
<
ag_fixatitem
>();
var
allotList
=
perforPerallotRepository
.
GetEntities
(
t
=>
t
.
HospitalId
==
request
.
HospitalId
);
var
secondList
=
Mapper
.
Map
<
List
<
SecondListResponse
>>(
perforAgsecondallotRepository
.
GetEntities
(
t
=>
allotList
.
Select
(
a
=>
a
.
ID
).
Contains
(
t
.
AllotId
.
Value
)
&&
new
List
<
int
>
{
1
,
4
}.
Contains
(
t
.
Status
??
1
)));
var
seconds
=
perforAgsecondallotRepository
.
GetEntities
(
t
=>
allotList
.
Select
(
a
=>
a
.
ID
).
Contains
(
t
.
AllotId
.
Value
)
&&
new
List
<
int
>
{
1
,
4
}.
Contains
(
t
.
Status
??
1
));
var
secondList
=
Mapper
.
Map
<
List
<
SecondListResponse
>>(
seconds
);
secondList
?.
ForEach
(
t
=>
t
.
IsArchive
=
allotList
.
FirstOrDefault
(
a
=>
a
.
ID
==
t
.
AllotId
).
States
==
8
?
1
:
0
);
//获取未归档 未提交 驳回 的二次绩效
...
...
@@ -550,12 +552,17 @@ public bool UseTemp(UseTempRequest request)
var
fixatList
=
perforAgfixatitemRepository
.
GetEntities
(
t
=>
secondId
.
Contains
(
t
.
SecondId
.
Value
));
#
region
获取需要添加的数据
和
无需操作的数据
var
update_second_usetemps
=
new
List
<
ag_secondallot
>();
foreach
(
var
second
in
secondList
)
{
foreach
(
var
head
in
headItems
)
{
if
(
second
.
IsArchive
==
0
&&
new
List
<
int
>
{
1
,
4
}.
Contains
(
second
.
Status
??
1
))
{
var
update_second_usetemp
=
seconds
.
FirstOrDefault
(
t
=>
t
.
Id
==
second
.
Id
);
update_second_usetemp
.
UseTempId
=
request
.
TempId
;
update_second_usetemps
.
Add
(
update_second_usetemp
);
var
exist
=
fixatList
?.
Where
(
t
=>
t
.
ItemName
==
head
.
FiledName
&&
t
.
Type
==
head
.
Type
&&
t
.
SecondId
==
second
.
Id
);
if
(
exist
!=
null
&&
exist
.
Count
()
>
0
)
list
.
AddRange
(
exist
);
...
...
@@ -582,6 +589,7 @@ public bool UseTemp(UseTempRequest request)
}
}
#
endregion
perforAgsecondallotRepository
.
UpdateRange
(
update_second_usetemps
.
ToArray
());
if
(
list
!=
null
&&
list
.
Count
>
0
)
{
var
delList
=
fixatList
.
Except
(
list
);
...
...
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