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
1be136cc
Commit
1be136cc
authored
Apr 09, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增模板名称返回
parent
24774025
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
performance/Performance.DtoModels/Response/SecondAllotResponse.cs
+1
-0
performance/Performance.Services/SecondAllot/SecondAllotService.cs
+11
-6
No files found.
performance/Performance.DtoModels/Response/SecondAllotResponse.cs
View file @
1be136cc
...
@@ -15,6 +15,7 @@ public class SecondAllotResponse
...
@@ -15,6 +15,7 @@ public class SecondAllotResponse
public
class
Detail
public
class
Detail
{
{
public
int
TempId
{
get
;
set
;
}
public
int
TempId
{
get
;
set
;
}
public
string
TempName
{
get
;
set
;
}
/// <summary> 是否归档 </summary>
/// <summary> 是否归档 </summary>
public
int
IsArchive
{
get
;
set
;
}
public
int
IsArchive
{
get
;
set
;
}
...
...
performance/Performance.Services/SecondAllot/SecondAllotService.cs
View file @
1be136cc
...
@@ -23,9 +23,11 @@ public SecondAllotResponse GetSecondSavedData(int userId, int secondId, int empl
...
@@ -23,9 +23,11 @@ public SecondAllotResponse GetSecondSavedData(int userId, int secondId, int empl
var
allot
=
perallotRepository
.
GetEntity
(
t
=>
t
.
ID
==
second
.
AllotId
);
var
allot
=
perallotRepository
.
GetEntity
(
t
=>
t
.
ID
==
second
.
AllotId
);
if
(
allot
==
null
)
throw
new
PerformanceException
(
"绩效记录不存在!"
);
if
(
allot
==
null
)
throw
new
PerformanceException
(
"绩效记录不存在!"
);
var
(
tempId
,
name
)
=
GetUsingTempId
(
allot
.
HospitalId
,
second
);
var
detail
=
new
Detail
()
var
detail
=
new
Detail
()
{
{
TempId
=
GetUsingTempId
(
allot
.
HospitalId
,
second
),
TempId
=
tempId
,
TempName
=
name
,
IsArchive
=
allot
.
States
==
8
?
1
:
0
,
IsArchive
=
allot
.
States
==
8
?
1
:
0
,
States
=
allot
.
States
,
States
=
allot
.
States
,
Status
=
second
.
Status
??
1
,
Status
=
second
.
Status
??
1
,
...
@@ -269,15 +271,18 @@ private JArray GetBodyResult(int hospitalId, ag_secondallot second, List<ag_body
...
@@ -269,15 +271,18 @@ private JArray GetBodyResult(int hospitalId, ag_secondallot second, List<ag_body
/// <param name="hospitalId"></param>
/// <param name="hospitalId"></param>
/// <param name="second"></param>
/// <param name="second"></param>
/// <returns></returns>
/// <returns></returns>
private
int
GetUsingTempId
(
int
hospitalId
,
ag_secondallot
second
)
private
(
int
tempId
,
string
name
)
GetUsingTempId
(
int
hospitalId
,
ag_secondallot
second
)
{
{
int
usingTempId
=
(
int
)
Temp
.
other
;
int
usingTempId
=
(
int
)
Temp
.
other
;
var
usedTemp
=
agusetempRepository
.
GetEntity
(
t
=>
t
.
HospitalId
==
hospitalId
&&
t
.
Department
==
second
.
Department
&&
t
.
UnitType
==
second
.
UnitType
);
var
usedTemp
=
agusetempRepository
.
GetEntity
(
t
=>
t
.
HospitalId
==
hospitalId
&&
t
.
Department
==
second
.
Department
&&
t
.
UnitType
==
second
.
UnitType
);
if
(
usedTemp
==
null
)
return
usingTempId
;
if
(
usedTemp
!=
null
)
{
if
(
new
int
[]
{
2
,
3
}.
Contains
(
second
.
Status
??
1
))
usingTempId
=
(
second
.
UseTempId
??
0
)
==
0
?
(
int
)
Temp
.
other
:
second
.
UseTempId
.
Value
;
}
var
temp
=
agtempRepository
.
GetEntity
(
t
=>
t
.
Id
==
usingTempId
);
if
(
new
int
[]
{
2
,
3
}.
Contains
(
second
.
Status
??
1
))
return
(
usingTempId
,
temp
?.
TempName
);
usingTempId
=
(
second
.
UseTempId
??
0
)
==
0
?
(
int
)
Temp
.
other
:
second
.
UseTempId
.
Value
;
return
usingTempId
;
}
}
/// <summary>
/// <summary>
...
...
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