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
252da0e7
Commit
252da0e7
authored
May 25, 2021
by
jianan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资单明细功能
parent
008d0c05
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
409 additions
and
13 deletions
+409
-13
yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java
+33
-6
yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerBasicInfoService.java
+9
-2
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
+108
-5
yd-api/src/main/java/com/yd/api/practitioner/vo/n22/QuerySalaryDetailRequestVO.java
+13
-0
yd-api/src/main/java/com/yd/api/practitioner/vo/n22/QuerySalaryDetailResponseVO.java
+15
-0
yd-api/src/main/java/com/yd/api/practitioner/vo/n22/SalaryDetail.java
+16
-0
yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleInfo.java
+18
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/SalaryDetails.java
+6
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/Commission.java
+38
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/FirstYearPerformanceCommission.java
+18
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/OtherCommission.java
+10
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RecommendSystemCommission.java
+16
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RenewalYearPerformanceCommission.java
+16
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsRequestBody.java
+18
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java
+41
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseVO.java
+10
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/service/N22SalaryService.java
+4
-0
yd-api/src/main/java/com/yd/rmi/n22/salary/service/impl/N22SalaryServiceImpl.java
+20
-0
No files found.
yd-api/src/main/java/com/yd/api/practitioner/PractitionerController.java
View file @
252da0e7
...
@@ -8,6 +8,8 @@ import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
...
@@ -8,6 +8,8 @@ import com.yd.api.practitioner.vo.login.PractitionerLoginRequestVO;
import
com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO
;
import
com.yd.api.practitioner.vo.login.PractitionerLoginResponseVO
;
import
com.yd.api.practitioner.vo.media.MediaGetReqVO
;
import
com.yd.api.practitioner.vo.media.MediaGetReqVO
;
import
com.yd.api.practitioner.vo.media.MediaGetRespVO
;
import
com.yd.api.practitioner.vo.media.MediaGetRespVO
;
import
com.yd.api.practitioner.vo.n22.QuerySalaryDetailRequestVO
;
import
com.yd.api.practitioner.vo.n22.QuerySalaryDetailResponseVO
;
import
com.yd.api.practitioner.vo.opportunity.*
;
import
com.yd.api.practitioner.vo.opportunity.*
;
import
com.yd.api.practitioner.vo.organization.OrganizationQueryRequestVO
;
import
com.yd.api.practitioner.vo.organization.OrganizationQueryRequestVO
;
import
com.yd.api.practitioner.vo.organization.OrganizationQueryResponseVO
;
import
com.yd.api.practitioner.vo.organization.OrganizationQueryResponseVO
;
...
@@ -30,18 +32,15 @@ import com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailResponseVO;
...
@@ -30,18 +32,15 @@ import com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailResponseVO;
import
com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryRequestVO
;
import
com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryRequestVO
;
import
com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO
;
import
com.yd.api.practitioner.vo.subordinate.SubordinateSystemMemberQueryResponseVO
;
import
com.yd.api.result.JsonResult
;
import
com.yd.api.result.JsonResult
;
import
com.yd.rmi.n22.policy.pojo.policydetail.PolicyDetailQueryRequestBody
;
import
com.yd.rmi.n22.policy.pojo.policydetail.PolicyDetailQueryResponseVO
;
import
com.yd.rmi.n22.policy.service.N22PolicyService
;
import
com.yd.rmi.n22.policy.service.N22PolicyService
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsRequestBody
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseBody
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseVO
;
import
com.yd.rmi.n22.staff.service.N22StaffService
;
import
com.yd.rmi.n22.staff.service.N22StaffService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
import
java.awt.*
;
@Controller
@Controller
@RestController
@RestController
...
@@ -479,6 +478,34 @@ public class PractitionerController {
...
@@ -479,6 +478,34 @@ public class PractitionerController {
return
result
;
return
result
;
}
}
/**
* 经纪人薪资单明细查询接口
* @param requestVO 请求信息
* @return PolicyInfoQueryResponseVO
*/
@RequestMapping
(
"/searchStaffSalaryDetails"
)
public
Object
searchStaffSalaryDetails
(
@RequestBody
SearchStaffSalaryDetailsRequestBody
requestVO
){
JsonResult
result
=
new
JsonResult
();
SearchStaffSalaryDetailsResponseBody
responseVO
=
practitionerBasicInfoService
.
searchStaffSalaryDetails
(
requestVO
);
result
.
setData
(
responseVO
);
result
.
addResult
(
responseVO
);
return
result
;
}
/**
* 薪资单明细保单列表查询接口
* @param requestVO 请求信息
* @return PolicyInfoQueryResponseVO
*/
@RequestMapping
(
"/querySalaryDetail"
)
public
Object
querySalaryDetail
(
@RequestBody
QuerySalaryDetailRequestVO
requestVO
){
JsonResult
result
=
new
JsonResult
();
QuerySalaryDetailResponseVO
responseVO
=
practitionerBasicInfoService
.
querySalaryDetail
(
requestVO
);
result
.
setData
(
responseVO
);
result
.
addResult
(
responseVO
);
return
result
;
}
/**
/**
* 获取经纪人的薪资表
* 获取经纪人的薪资表
...
...
yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerBasicInfoService.java
View file @
252da0e7
package
com
.
yd
.
api
.
practitioner
.
service
;
package
com
.
yd
.
api
.
practitioner
.
service
;
import
com.yd.api.practitioner.vo.
opportunity.ApplyForExpertSupport
RequestVO
;
import
com.yd.api.practitioner.vo.
n22.QuerySalaryDetail
RequestVO
;
import
com.yd.api.practitioner.vo.
opportunity.ApplyForExpertSupport
ResponseVO
;
import
com.yd.api.practitioner.vo.
n22.QuerySalaryDetail
ResponseVO
;
import
com.yd.api.practitioner.vo.organization.OrganizationQueryRequestVO
;
import
com.yd.api.practitioner.vo.organization.OrganizationQueryRequestVO
;
import
com.yd.api.practitioner.vo.organization.OrganizationQueryResponseVO
;
import
com.yd.api.practitioner.vo.organization.OrganizationQueryResponseVO
;
import
com.yd.api.practitioner.vo.payscale.PayScalePdfRequestVO
;
import
com.yd.api.practitioner.vo.payscale.PayScalePdfRequestVO
;
...
@@ -14,6 +14,9 @@ import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryRequestV
...
@@ -14,6 +14,9 @@ import com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryRequestV
import
com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryResponseVO
;
import
com.yd.api.practitioner.vo.policy.policyinfoquery.PolicyInfoQueryResponseVO
;
import
com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailRequestVO
;
import
com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailRequestVO
;
import
com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailResponseVO
;
import
com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailResponseVO
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsRequestBody
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseBody
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseVO
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
@Service
(
"practitionerBasicInfoService"
)
@Service
(
"practitionerBasicInfoService"
)
...
@@ -54,4 +57,8 @@ public interface PractitionerBasicInfoService {
...
@@ -54,4 +57,8 @@ public interface PractitionerBasicInfoService {
OrganizationQueryResponseVO
organizationQuery
(
OrganizationQueryRequestVO
requestVO
);
OrganizationQueryResponseVO
organizationQuery
(
OrganizationQueryRequestVO
requestVO
);
QueryTeamMemberDetailResponseVO
queryTeamMemberDetail
(
QueryTeamMemberDetailRequestVO
requestVO
);
QueryTeamMemberDetailResponseVO
queryTeamMemberDetail
(
QueryTeamMemberDetailRequestVO
requestVO
);
QuerySalaryDetailResponseVO
querySalaryDetail
(
QuerySalaryDetailRequestVO
requestVO
);
SearchStaffSalaryDetailsResponseBody
searchStaffSalaryDetails
(
SearchStaffSalaryDetailsRequestBody
requestVO
);
}
}
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
View file @
252da0e7
...
@@ -2,8 +2,9 @@ package com.yd.api.practitioner.service.impl;
...
@@ -2,8 +2,9 @@ package com.yd.api.practitioner.service.impl;
import
com.google.common.base.Strings
;
import
com.google.common.base.Strings
;
import
com.yd.api.practitioner.service.PractitionerService
;
import
com.yd.api.practitioner.service.PractitionerService
;
import
com.yd.api.practitioner.vo.opportunity.ApplyForExpertSupportRequestVO
;
import
com.yd.api.practitioner.vo.n22.QuerySalaryDetailRequestVO
;
import
com.yd.api.practitioner.vo.opportunity.ApplyForExpertSupportResponseVO
;
import
com.yd.api.practitioner.vo.n22.QuerySalaryDetailResponseVO
;
import
com.yd.api.practitioner.vo.n22.SalaryDetail
;
import
com.yd.api.practitioner.vo.organization.*
;
import
com.yd.api.practitioner.vo.organization.*
;
import
com.yd.api.practitioner.vo.payscale.PayScalePdfRequestVO
;
import
com.yd.api.practitioner.vo.payscale.PayScalePdfRequestVO
;
import
com.yd.api.practitioner.service.PractitionerBasicInfoService
;
import
com.yd.api.practitioner.service.PractitionerBasicInfoService
;
...
@@ -15,7 +16,6 @@ import com.yd.api.practitioner.vo.policy.PolicyInfo;
...
@@ -15,7 +16,6 @@ import com.yd.api.practitioner.vo.policy.PolicyInfo;
import
com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO
;
import
com.yd.api.practitioner.vo.policy.PolicyListQueryRequestVO
;
import
com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO
;
import
com.yd.api.practitioner.vo.policy.PolicyListQueryResponseVO
;
import
com.yd.api.practitioner.vo.policy.policyinfoquery.*
;
import
com.yd.api.practitioner.vo.policy.policyinfoquery.*
;
import
com.yd.api.practitioner.vo.sechedule.DeleteScheduleByIdResponseVO
;
import
com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailRequestVO
;
import
com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailRequestVO
;
import
com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailResponseVO
;
import
com.yd.api.practitioner.vo.subordinate.QueryTeamMemberDetailResponseVO
;
import
com.yd.api.practitioner.vo.subordinate.TeamMemberDetail
;
import
com.yd.api.practitioner.vo.subordinate.TeamMemberDetail
;
...
@@ -53,7 +53,11 @@ import com.yd.rmi.n22.policy.pojo.policylist.PolicyListQueryRequestBody;
...
@@ -53,7 +53,11 @@ import com.yd.rmi.n22.policy.pojo.policylist.PolicyListQueryRequestBody;
import
com.yd.rmi.n22.policy.service.N22PolicyService
;
import
com.yd.rmi.n22.policy.service.N22PolicyService
;
import
com.yd.rmi.n22.salary.pojo.SalaryDetails
;
import
com.yd.rmi.n22.salary.pojo.SalaryDetails
;
import
com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchRequestBody
;
import
com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchRequestBody
;
import
com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchResponseBody
;
import
com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchResponseVO
;
import
com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchResponseVO
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsRequestBody
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseBody
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseVO
;
import
com.yd.rmi.n22.salary.service.N22SalaryService
;
import
com.yd.rmi.n22.salary.service.N22SalaryService
;
import
com.yd.rmi.n22.staff.pojo.GetStaffNewRequestBody
;
import
com.yd.rmi.n22.staff.pojo.GetStaffNewRequestBody
;
import
com.yd.rmi.n22.staff.pojo.GetStaffNewResponseVO
;
import
com.yd.rmi.n22.staff.pojo.GetStaffNewResponseVO
;
...
@@ -70,6 +74,7 @@ import org.springframework.stereotype.Service;
...
@@ -70,6 +74,7 @@ import org.springframework.stereotype.Service;
import
java.io.*
;
import
java.io.*
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
@Service
(
"practitionerBasicInfoService"
)
@Service
(
"practitionerBasicInfoService"
)
public
class
PractitionerBasicInfoServiceImpl
implements
PractitionerBasicInfoService
{
public
class
PractitionerBasicInfoServiceImpl
implements
PractitionerBasicInfoService
{
...
@@ -428,8 +433,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
...
@@ -428,8 +433,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
Double
monDtlAmount
=
0
D
;
Double
monDtlAmount
=
0
D
;
// 应发佣金
// 应发佣金
Double
monDtlRAmount
=
0
D
;
Double
monDtlRAmount
=
0
D
;
// loginName
// loginName等
String
loginName
=
""
;
String
loginName
=
null
;
String
years
=
null
;
String
month
=
null
;
for
(
String
key
:
group
.
keySet
())
{
for
(
String
key
:
group
.
keySet
())
{
System
.
out
.
println
(
"Key = "
+
key
);
System
.
out
.
println
(
"Key = "
+
key
);
...
@@ -439,6 +446,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
...
@@ -439,6 +446,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
monDtlAmount
=
list
.
get
(
0
).
getSumcommission
();
monDtlAmount
=
list
.
get
(
0
).
getSumcommission
();
monDtlRAmount
=
list
.
get
(
0
).
getTax_free_comis
();
monDtlRAmount
=
list
.
get
(
0
).
getTax_free_comis
();
loginName
=
list
.
get
(
0
).
getLoginName
();
loginName
=
list
.
get
(
0
).
getLoginName
();
years
=
String
.
valueOf
(
list
.
get
(
0
).
getYear
());
month
=
String
.
valueOf
(
list
.
get
(
0
).
getMonth
());
}
}
PayScaleInfo
payScaleInfo
=
new
PayScaleInfo
();
PayScaleInfo
payScaleInfo
=
new
PayScaleInfo
();
...
@@ -448,6 +457,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
...
@@ -448,6 +457,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
payScaleInfo
.
setDrpTitleCode
(
list
.
get
(
0
).
getGrade
());
payScaleInfo
.
setDrpTitleCode
(
list
.
get
(
0
).
getGrade
());
payScaleInfo
.
setMonDtlPeriod
(
key
);
payScaleInfo
.
setMonDtlPeriod
(
key
);
payScaleInfo
.
setLoginName
(
loginName
);
payScaleInfo
.
setLoginName
(
loginName
);
payScaleInfo
.
setYears
(
years
);
payScaleInfo
.
setMonth
(
month
);
resultList
.
add
(
payScaleInfo
);
resultList
.
add
(
payScaleInfo
);
}
}
...
@@ -637,6 +648,98 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
...
@@ -637,6 +648,98 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
return
resp
;
return
resp
;
}
}
@Override
public
QuerySalaryDetailResponseVO
querySalaryDetail
(
QuerySalaryDetailRequestVO
requestVO
)
{
// 1.查询佣金和税的接口
SalaryDetailsSearchRequestBody
salaryDetailsSearchRequestBody
=
new
SalaryDetailsSearchRequestBody
();
this
.
handleDateParams
(
salaryDetailsSearchRequestBody
,
requestVO
);
salaryDetailsSearchRequestBody
.
setLoginName
(
requestVO
.
getAgent_id
());
salaryDetailsSearchRequestBody
.
setSearchType
(
"1"
);
salaryDetailsSearchRequestBody
.
setPaid_Status
(
"1"
);
salaryDetailsSearchRequestBody
.
setCheckStatus
(
"1"
);
SalaryDetailsSearchResponseVO
salaryDetailsSearchResponseVO
=
n22SalaryService
.
salaryDetailsSearch
(
salaryDetailsSearchRequestBody
);
// 2.组装前端数据
QuerySalaryDetailResponseVO
responseVO
=
new
QuerySalaryDetailResponseVO
();
if
(
"查询成功"
.
equals
(
salaryDetailsSearchResponseVO
.
getResponseHead
().
getMessage
()))
{
SalaryDetailsSearchResponseBody
salaryDetails
=
salaryDetailsSearchResponseVO
.
getResponseBody
();
this
.
createQuerySalaryDetailResponseVO
(
responseVO
,
salaryDetails
);
responseVO
.
setCommonResult
(
new
CommonResult
(
true
,
ZHBErrorConfig
.
getErrorInfo
(
"800000"
)));
}
else
{
responseVO
.
setCommonResult
(
new
CommonResult
(
false
,
ZHBErrorConfig
.
getErrorInfo
(
"820001"
)));
}
return
responseVO
;
}
private
void
handleDateParams
(
SalaryDetailsSearchRequestBody
salaryDetailsSearchRequestBody
,
QuerySalaryDetailRequestVO
requestVO
)
{
String
years
=
requestVO
.
getYears
();
String
month
=
requestVO
.
getMonth
();
String
curDate
=
""
;
if
(
month
.
length
()
==
2
)
{
curDate
=
years
+
"-"
+
month
+
"-01"
;
}
else
if
(
month
.
length
()
==
1
)
{
curDate
=
years
+
"-0"
+
month
+
"-01"
;
}
salaryDetailsSearchRequestBody
.
setStartDate
(
curDate
);
salaryDetailsSearchRequestBody
.
setEndDate
(
curDate
);
}
@Override
public
SearchStaffSalaryDetailsResponseBody
searchStaffSalaryDetails
(
SearchStaffSalaryDetailsRequestBody
requestVO
)
{
SearchStaffSalaryDetailsResponseBody
responseBody
=
new
SearchStaffSalaryDetailsResponseBody
();
SearchStaffSalaryDetailsResponseVO
searchStaffSalaryDetailsResponseVO
=
n22SalaryService
.
searchStaffSalaryDetails
(
requestVO
);
if
(
"查询成功"
.
equals
(
searchStaffSalaryDetailsResponseVO
.
getResponseHead
().
getMessage
()))
{
responseBody
=
searchStaffSalaryDetailsResponseVO
.
getResponseBody
();
responseBody
.
setCommonResult
(
new
CommonResult
(
true
,
ZHBErrorConfig
.
getErrorInfo
(
"800000"
)));
}
else
{
responseBody
.
setCommonResult
(
new
CommonResult
(
false
,
ZHBErrorConfig
.
getErrorInfo
(
"820001"
)));
}
return
responseBody
;
}
private
QuerySalaryDetailResponseVO
createQuerySalaryDetailResponseVO
(
QuerySalaryDetailResponseVO
responseVO
,
SalaryDetailsSearchResponseBody
staffSalaryDetails
)
{
List
<
SalaryDetail
>
list
=
new
ArrayList
<>();
BigDecimal
abc
=
BigDecimal
.
ZERO
;
String
d
=
""
;
List
<
SalaryDetails
>
salaryDetailsList
=
staffSalaryDetails
.
getSalaryDetailsLIST
();
// 1.过滤掉SalaryName=FYC的元素
salaryDetailsList
=
salaryDetailsList
.
stream
()
.
filter
((
SalaryDetails
i
)
->
!
"FYC"
.
equals
(
i
.
getSalaryName
()))
.
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isNotEmpty
(
salaryDetailsList
))
{
// 代扣个人所得税
Double
tax_free_comis
=
salaryDetailsList
.
get
(
0
).
getTax_free_comis
();
responseVO
.
setD
(
tax_free_comis
.
toString
());
// 佣金合计
for
(
SalaryDetails
item
:
salaryDetailsList
)
{
abc
=
abc
.
add
(
BigDecimal
.
valueOf
(
item
.
getCommission
()));
}
responseVO
.
setAbc
(
abc
.
toString
());
// list
for
(
SalaryDetails
item
:
salaryDetailsList
)
{
SalaryDetail
target
=
new
SalaryDetail
();
BeanUtils
.
copyProperties
(
item
,
target
);
list
.
add
(
target
);
}
responseVO
.
setList
(
list
);
}
return
responseVO
;
}
private
void
getResponseMessage
(
OrganizationQueryResponseVO
responseVO
,
List
<
PractitionerSubordinateSystemInfo
>
subordinateSystemInfoList
,
List
<
InsurerBranchDeptInfo
>
insurerBranchDeptInfoList
,
List
<
InsurerBranchInfo
>
insurerBranchInfoList
)
{
private
void
getResponseMessage
(
OrganizationQueryResponseVO
responseVO
,
List
<
PractitionerSubordinateSystemInfo
>
subordinateSystemInfoList
,
List
<
InsurerBranchDeptInfo
>
insurerBranchDeptInfoList
,
List
<
InsurerBranchInfo
>
insurerBranchInfoList
)
{
Map
<
String
,
List
<
PractitionerSubordinateSystemInfo
>>
systemMap
=
new
HashMap
<>();
Map
<
String
,
List
<
PractitionerSubordinateSystemInfo
>>
systemMap
=
new
HashMap
<>();
List
<
PractitionerSubordinateSystemInfo
>
systemInfoList
;
List
<
PractitionerSubordinateSystemInfo
>
systemInfoList
;
...
...
yd-api/src/main/java/com/yd/api/practitioner/vo/n22/QuerySalaryDetailRequestVO.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
api
.
practitioner
.
vo
.
n22
;
import
lombok.Data
;
@Data
public
class
QuerySalaryDetailRequestVO
{
private
String
years
;
private
String
month
;
private
String
agent_id
;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/n22/QuerySalaryDetailResponseVO.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
api
.
practitioner
.
vo
.
n22
;
import
com.yd.api.result.CommonResult
;
import
com.yd.rmi.n22.salary.pojo.SalaryDetails
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
QuerySalaryDetailResponseVO
{
private
String
abc
;
//佣金合计
private
String
d
;
//代扣个人所得税
private
List
<
SalaryDetail
>
list
;
private
CommonResult
commonResult
;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/n22/SalaryDetail.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
api
.
practitioner
.
vo
.
n22
;
import
lombok.Data
;
@Data
public
class
SalaryDetail
{
private
String
Project_id
;
private
String
SalaryName
;
private
Double
commission
;
private
Double
sumcommission
;
//本期应税所得
private
Double
total_commission
;
//年度累计应税所得
private
Double
total_personal_tax
;
//累计应扣所得税
private
Double
total_paid
;
//累计已扣所得税
private
Double
tax_free_comis
;
//本期应扣所得税
}
yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleInfo.java
View file @
252da0e7
...
@@ -13,6 +13,8 @@ public class PayScaleInfo {
...
@@ -13,6 +13,8 @@ public class PayScaleInfo {
private
String
createUser
;
private
String
createUser
;
private
String
pdfOssPath
;
private
String
pdfOssPath
;
private
String
loginName
;
private
String
loginName
;
private
String
years
;
private
String
month
;
public
Long
getMonShId
()
{
public
Long
getMonShId
()
{
return
monShId
;
return
monShId
;
...
@@ -109,4 +111,20 @@ public class PayScaleInfo {
...
@@ -109,4 +111,20 @@ public class PayScaleInfo {
public
void
setLoginName
(
String
loginName
)
{
public
void
setLoginName
(
String
loginName
)
{
this
.
loginName
=
loginName
;
this
.
loginName
=
loginName
;
}
}
public
String
getYears
()
{
return
years
;
}
public
void
setYears
(
String
years
)
{
this
.
years
=
years
;
}
public
String
getMonth
()
{
return
month
;
}
public
void
setMonth
(
String
month
)
{
this
.
month
=
month
;
}
}
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/SalaryDetails.java
View file @
252da0e7
...
@@ -6,6 +6,8 @@ import lombok.Data;
...
@@ -6,6 +6,8 @@ import lombok.Data;
@Data
@Data
public
class
SalaryDetails
{
public
class
SalaryDetails
{
private
String
Project_id
;
private
String
SalaryName
;
private
String
SalaryName
;
private
String
Appl_No
;
private
String
Appl_No
;
...
@@ -55,4 +57,8 @@ public class SalaryDetails {
...
@@ -55,4 +57,8 @@ public class SalaryDetails {
private
Double
value_add_tax
;
private
Double
value_add_tax
;
private
Double
total_commission
;
private
Double
total_personal_tax
;
private
Double
total_paid
;
}
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/Commission.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
pojo
.
searchstaffsalarydetails
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
lombok.Data
;
@Data
public
class
Commission
{
private
String
Customer
;
private
String
Policyno
;
private
String
Pol_name_chn
;
private
String
EffectiveDate
;
private
String
Insurance_Cust
;
private
int
Year
;
private
int
YearPREMIUM
;
private
double
SalesCommissionRate
;
@JSONField
(
name
=
"FYC/RYC"
)
private
double
FYC_RYC
;
private
String
Level
;
private
int
Rate
;
private
double
Commission
;
private
String
Salestaff
;
private
String
SaleSystem
;
private
String
Comments
;
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/FirstYearPerformanceCommission.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
pojo
.
searchstaffsalarydetails
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
lombok.Data
;
@Data
public
class
FirstYearPerformanceCommission
{
private
String
SaleSystem
;
//销售当前体系
@JSONField
(
name
=
"FYC/RYC"
)
private
String
FYC_RYC
;
//当前体系FYC
private
String
BackCommission
;
//业绩回算FYC(含育成回算)
private
String
T_BackCommission
;
//育成回算业绩FYC
private
String
Rate
;
//绩效奖金比率%
private
String
Commission
;
//首年度绩效奖金
private
String
Comments
;
//备注
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/OtherCommission.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
pojo
.
searchstaffsalarydetails
;
import
lombok.Data
;
@Data
public
class
OtherCommission
{
private
String
CommissionName
;
//奖金名称
private
String
Commission
;
//奖金金额
private
String
Comments
;
//备注
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RecommendSystemCommission.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
pojo
.
searchstaffsalarydetails
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
lombok.Data
;
@Data
public
class
RecommendSystemCommission
{
private
String
SaleSystem
;
@JSONField
(
name
=
"FYC/RYC"
)
private
String
FYC_RYC
;
private
String
Rate
;
private
String
Commission
;
private
String
Comments
;
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RenewalYearPerformanceCommission.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
pojo
.
searchstaffsalarydetails
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
lombok.Data
;
@Data
public
class
RenewalYearPerformanceCommission
{
private
String
SaleSystem
;
@JSONField
(
name
=
"FYC/RYC"
)
private
String
FYC_RYC
;
private
String
Rate
;
private
String
Commission
;
private
String
Comments
;
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsRequestBody.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
pojo
.
searchstaffsalarydetails
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
SearchStaffSalaryDetailsRequestBody
{
private
String
Epid
;
private
String
agent_id
;
private
String
years
;
private
String
month
;
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
pojo
.
searchstaffsalarydetails
;
import
com.yd.api.result.CommonResult
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
SearchStaffSalaryDetailsResponseBody
{
private
CommonResult
commonResult
;
private
String
agent_id
;
private
String
staffname
;
private
String
years
;
private
String
month
;
private
List
<
Commission
>
FristYearCommissionList
;
private
List
<
Commission
>
RenewalYearCommissionList
;
private
List
<
Commission
>
FristYearCoachCommissionList
;
private
List
<
Commission
>
RenewalYearCoachCommissionList
;
private
List
<
Commission
>
SpecialManagementCommissionList
;
private
List
<
Commission
>
RecommendCommissionList
;
private
List
<
RecommendSystemCommission
>
RecommendSystemCommissionList
;
private
List
<
FirstYearPerformanceCommission
>
FirstYearPerformanceCommissionList
;
private
List
<
RenewalYearPerformanceCommission
>
RenewalYearPerformanceCommissionList
;
private
List
<
OtherCommission
>
OtherCommissionList
;
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseVO.java
0 → 100644
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
pojo
.
searchstaffsalarydetails
;
import
com.yd.rmi.n22.common.pojo.ResponseHead
;
import
lombok.Data
;
@Data
public
class
SearchStaffSalaryDetailsResponseVO
{
private
ResponseHead
responseHead
;
private
SearchStaffSalaryDetailsResponseBody
responseBody
;
}
yd-api/src/main/java/com/yd/rmi/n22/salary/service/N22SalaryService.java
View file @
252da0e7
package
com
.
yd
.
rmi
.
n22
.
salary
.
service
;
package
com
.
yd
.
rmi
.
n22
.
salary
.
service
;
import
com.yd.rmi.n22.salary.pojo.*
;
import
com.yd.rmi.n22.salary.pojo.*
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsRequestBody
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseVO
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -11,4 +13,6 @@ public interface N22SalaryService {
...
@@ -11,4 +13,6 @@ public interface N22SalaryService {
SearchStaffAchievementResponseVO
searchStaffAchievement
(
SearchStaffAchievementRequestBody
searchStaffAchievementRequestBody
);
SearchStaffAchievementResponseVO
searchStaffAchievement
(
SearchStaffAchievementRequestBody
searchStaffAchievementRequestBody
);
List
<
Achieve
>
searchStaffAchievementGetAchieveList
(
SearchStaffAchievementResponseVO
searchStaffAchievementResponseVO
)
throws
Exception
;
List
<
Achieve
>
searchStaffAchievementGetAchieveList
(
SearchStaffAchievementResponseVO
searchStaffAchievementResponseVO
)
throws
Exception
;
SearchStaffSalaryDetailsResponseVO
searchStaffSalaryDetails
(
SearchStaffSalaryDetailsRequestBody
searchStaffSalaryDetailsRequestBody
);
}
}
yd-api/src/main/java/com/yd/rmi/n22/salary/service/impl/N22SalaryServiceImpl.java
View file @
252da0e7
...
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
...
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import
com.yd.rmi.cache.SystemConfigService
;
import
com.yd.rmi.cache.SystemConfigService
;
import
com.yd.rmi.n22.common.utils.N22Utils
;
import
com.yd.rmi.n22.common.utils.N22Utils
;
import
com.yd.rmi.n22.salary.pojo.*
;
import
com.yd.rmi.n22.salary.pojo.*
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsRequestBody
;
import
com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseVO
;
import
com.yd.rmi.n22.salary.service.N22SalaryService
;
import
com.yd.rmi.n22.salary.service.N22SalaryService
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -61,4 +63,22 @@ public class N22SalaryServiceImpl implements N22SalaryService {
...
@@ -61,4 +63,22 @@ public class N22SalaryServiceImpl implements N22SalaryService {
}
}
return
searchStaffAchievementResponseVO
.
getResponseBody
().
getAchieveList
();
return
searchStaffAchievementResponseVO
.
getResponseBody
().
getAchieveList
();
}
}
@Override
public
SearchStaffSalaryDetailsResponseVO
searchStaffSalaryDetails
(
SearchStaffSalaryDetailsRequestBody
searchStaffSalaryDetailsRequestBody
)
{
JSONObject
obj
=
new
JSONObject
();
//接口传参
JSONObject
requestHead
=
new
JSONObject
();
requestHead
.
put
(
"seqNo"
,
UUID
.
randomUUID
().
toString
());
obj
.
put
(
"requestHead"
,
requestHead
);
obj
.
put
(
"requestBody"
,
searchStaffSalaryDetailsRequestBody
);
String
url
=
systemConfigService
.
getSingleConfigValue
(
"N22_URL_Search_Staff_Salary_Details"
);
String
result
=
N22Utils
.
postTransaction
(
url
,
obj
.
toString
());
SearchStaffSalaryDetailsResponseVO
response
=
JSONObject
.
parseObject
(
result
,
SearchStaffSalaryDetailsResponseVO
.
class
);
return
response
;
}
}
}
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