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
5fb4a0ab
Commit
5fb4a0ab
authored
Jun 28, 2023
by
ruyun.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
手工数据录入调整
parent
cd1acd9b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
performance/Performance.Services/EmployeeService.cs
+8
-7
No files found.
performance/Performance.Services/EmployeeService.cs
View file @
5fb4a0ab
...
...
@@ -1592,10 +1592,10 @@ public List<GatherDropResponse> GetGatherDrop(Gather gather)
sheetHeads
=
sheetHeads
.
Where
(
w
=>
!
takeOut
.
Contains
(
w
.
HeadName
));
result
=
sheetHeads
.
GroupBy
(
t
=>
t
.
ModuleName
).
Select
(
s
=>
new
GatherDropResponse
{
Value
=
Regex
.
Replace
(
s
.
Key
.
Replace
(
" "
,
""
).
Replace
(
"."
,
""
),
"[0-9]"
,
""
)
,
Value
=
s
.
Key
,
Children
=
sheetHeads
.
Where
(
t
=>
t
.
ModuleName
==
s
.
Key
).
Select
(
t
=>
new
GatherDropResponse
()
{
Value
=
Regex
.
Replace
(
t
.
HeadName
.
Replace
(
" "
,
""
).
Replace
(
"."
,
""
),
"[0-9]"
,
""
)
Value
=
t
.
HeadName
}).
ToList
()
}).
ToList
();
}
...
...
@@ -1606,10 +1606,10 @@ public List<GatherDropResponse> GetGatherDrop(Gather gather)
result
=
permissions
.
GroupBy
(
t
=>
t
.
SheetName
).
Select
(
s
=>
new
GatherDropResponse
{
Value
=
Regex
.
Replace
(
s
.
Key
.
Replace
(
" "
,
""
).
Replace
(
"."
,
""
),
"[0-9]"
,
""
)
,
Value
=
s
.
Key
,
Children
=
permissions
.
Where
(
t
=>
t
.
SheetName
==
s
.
Key
).
Select
(
t
=>
new
GatherDropResponse
()
{
Value
=
Regex
.
Replace
(
t
.
HeadName
.
Replace
(
" "
,
""
).
Replace
(
"."
,
""
),
"[0-9]"
,
""
)
Value
=
t
.
HeadName
}).
ToList
()
}).
ToList
();
}
...
...
@@ -1680,7 +1680,7 @@ public GatherInfo GetGather(Gather gather)
var
result
=
datas
.
Select
(
t
=>
new
GatherInfoRequest
{
Source
=
Regex
.
Replace
(
t
.
Source
.
Replace
(
" "
,
""
).
Replace
(
"."
,
""
),
"[0-9]"
,
""
)
,
Source
=
t
.
Source
,
CreateTime
=
t
.
CreateTime
.
ToString
(
"d"
),
Department
=
t
.
Department
,
UserId
=
t
.
Submitter
,
...
...
@@ -1719,7 +1719,7 @@ public GatherResponse GetGatherTotal(Gather gather)
var
userLogin
=
user
.
FirstOrDefault
(
t
=>
t
.
ID
==
gather
.
UserId
);
var
userSource
=
perforcollectpermissionRepository
.
GetEntities
(
t
=>
t
.
UserId
==
gather
.
UserId
)
.
Select
(
s
=>
Regex
.
Replace
(
s
.
SheetName
.
Replace
(
" "
,
""
).
Replace
(
"."
,
""
),
"[0-9]"
,
""
)
)
.
Select
(
s
=>
s
.
SheetName
)
.
Distinct
().
ToList
();
var
userrole
=
userroleRepository
.
GetEntity
(
t
=>
t
.
UserID
==
gather
.
UserId
);
...
...
@@ -1873,7 +1873,8 @@ public ApiResponse SaveGatherHands(int allotId, SaveGatherData saveGather)
var
sheets
=
perforPersheetRepository
.
GetEntities
(
w
=>
w
.
AllotID
==
allotId
);
if
(
sheets
!=
null
&&
sheets
.
Any
())
{
if
(!
sheets
.
Select
(
t
=>
t
.
SheetName
).
Any
(
t
=>
t
.
Contains
(
saveGather
.
Source
)))
var
tempSourceName
=
Regex
.
Replace
(
saveGather
.
Source
.
Replace
(
" "
,
""
).
Replace
(
"."
,
""
),
"[0-9]"
,
""
);
if
(!
sheets
.
Select
(
t
=>
t
.
SheetName
).
Any
(
t
=>
t
.
Contains
(
tempSourceName
)))
throw
new
PerformanceException
(
$"来源错误[
{
saveGather
.
Source
}
]"
);
}
...
...
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