Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-backend
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
AutogeneralShanghai
yd-backend
Commits
a966f6a3
Commit
a966f6a3
authored
Mar 10, 2021
by
jianan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资单临时方案问题
parent
03a1aab2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
+6
-2
No files found.
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
View file @
a966f6a3
...
...
@@ -136,6 +136,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
PayScaleQueryResponseVO
responseVO
=
new
PayScaleQueryResponseVO
();
String
practitionerIdEG
=
requestVO
.
getPractitionerIdEG
();
Long
practitionerId
=
requestVO
.
getPractitionerId
();
Map
<
Long
,
PayScaleInfo
>
payScaleInfoMap
=
new
HashMap
<>();
if
(!
Strings
.
isNullOrEmpty
(
practitionerIdEG
)
&&
practitionerId
!=
null
){
List
<
PayScaleInfo
>
payScaleInfoListAll
=
aclPractitionerDALService
.
findPayScaleByPractitionerEG
(
practitionerIdEG
);
...
...
@@ -146,7 +147,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
optionsEGoldenList
.
forEach
(
i
->
dtlTypeMap
.
put
(
i
.
getOptAttr
(),
i
.
getOptName
()));
List
<
OptionsEGolden
>
titleList
=
mdDropOptionsDALService
.
findAllTitleEG
();
titleList
.
forEach
(
i
->
titleMap
.
put
(
i
.
getTitleCode
(),
i
.
getTitleName
()));
Map
<
Long
,
PayScaleInfo
>
payScaleInfoMap
=
new
HashMap
<>();
PayScaleInfo
payScaleInfo
;
Long
time
;
for
(
PayScaleInfo
item
:
payScaleInfoListAll
){
...
...
@@ -167,6 +168,9 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
for
(
PayScaleInfo
item
:
payScaleInfoListAll
){
item
.
setMonDtlRAmount
(
CommonUtil
.
doubleFormat
(
item
.
getMonDtlRAmount
(),
2
));
}
}
List
<
PayScaleInfo
>
resultList
=
new
ArrayList
<>(
payScaleInfoMap
.
values
());
// 加入临时薪资表的数据
...
...
@@ -176,7 +180,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
// 排序
resultList
.
sort
(
Comparator
.
comparingLong
(
PayScaleInfo
::
getMonDtlPeriod
).
reversed
());
responseVO
.
setPayScaleInfos
(
resultList
);
}
responseVO
.
setCommonResult
(
new
CommonResult
(
true
,
ZHBErrorConfig
.
getErrorInfo
(
"800000"
)));
}
else
{
String
[]
params
=
{
"practitionerIdEG, practitionerId"
};
...
...
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