Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Y
yifu-mvp
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
b7346c87
You need to sign in or sign up before continuing.
Commit
b7346c87
authored
Sep 05, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
薪资tSalaryStandard
parent
676ea1d3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
11 deletions
+24
-11
TSettleDomain.java
...ifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java
+16
-7
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+5
-3
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+3
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java
View file @
b7346c87
...
@@ -405,13 +405,6 @@ public class TSettleDomain extends BaseEntity {
...
@@ -405,13 +405,6 @@ public class TSettleDomain extends BaseEntity {
@Length
(
max
=
1
,
message
=
"管理费风险金的结算方式:1预估2实缴不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"管理费风险金的结算方式:1预估2实缴不能超过1个字符"
)
@ExcelProperty
(
"管理费风险金的结算方式:1预估2实缴"
)
@ExcelProperty
(
"管理费风险金的结算方式:1预估2实缴"
)
private
String
mrSettleType
;
private
String
mrSettleType
;
/**
* 管理费风险金的收取服务项目:1社保2公积金3商险4薪酬
*/
@ExcelAttribute
(
name
=
"管理费风险金的收取服务项目:1社保2公积金3商险4薪酬"
,
maxLength
=
4
)
@Length
(
max
=
4
,
message
=
"管理费风险金的收取服务项目:1社保2公积金3商险4薪酬不能超过4个字符"
)
@ExcelProperty
(
"管理费风险金的收取服务项目:1社保2公积金3商险4薪酬"
)
private
String
mrServerItem
;
/**
/**
* 管理费是否收费(0收费/1不收费)
* 管理费是否收费(0收费/1不收费)
*/
*/
...
@@ -453,4 +446,20 @@ public class TSettleDomain extends BaseEntity {
...
@@ -453,4 +446,20 @@ public class TSettleDomain extends BaseEntity {
@ExcelProperty
(
"风险金收费方式:1按比例2金额-人数3金额-人次"
)
@ExcelProperty
(
"风险金收费方式:1按比例2金额-人数3金额-人次"
)
private
String
riskFundType
;
private
String
riskFundType
;
/**
* 管理费的收取服务项目:1社保2公积金3商险4薪酬
*/
@ExcelAttribute
(
name
=
"管理费的收取服务项目:1社保2公积金3商险4薪酬"
,
maxLength
=
4
)
@Length
(
max
=
4
,
message
=
"管理费的收取服务项目:1社保2公积金3商险4薪酬不能超过4个字符"
)
@ExcelProperty
(
"管理费的收取服务项目:1社保2公积金3商险4薪酬"
)
private
String
manageServerItem
;
/**
* 风险金的收取服务项目:1社保2公积金3商险4薪酬
*/
@ExcelAttribute
(
name
=
"风险金的收取服务项目:1社保2公积金3商险4薪酬"
,
maxLength
=
4
)
@Length
(
max
=
4
,
message
=
"风险金的收取服务项目:1社保2公积金3商险4薪酬不能超过4个字符"
)
@ExcelProperty
(
"风险金的收取服务项目:1社保2公积金3商险4薪酬"
)
private
String
riskServerItem
;
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
b7346c87
...
@@ -79,13 +79,14 @@
...
@@ -79,13 +79,14 @@
<result
property=
"customerNo"
column=
"CUSTOMER_NO"
/>
<result
property=
"customerNo"
column=
"CUSTOMER_NO"
/>
<result
property=
"customerName"
column=
"CUSTOMER_NAME"
/>
<result
property=
"customerName"
column=
"CUSTOMER_NAME"
/>
<result
property=
"mrSettleType"
column=
"MR_SETTLE_TYPE"
/>
<result
property=
"mrSettleType"
column=
"MR_SETTLE_TYPE"
/>
<result
property=
"mrServerItem"
column=
"MR_SERVER_ITEM"
/>
<result
property=
"managementTag"
column=
"MANAGEMENT_TAG"
/>
<result
property=
"managementTag"
column=
"MANAGEMENT_TAG"
/>
<result
property=
"managementFee"
column=
"MANAGEMENT_FEE"
/>
<result
property=
"managementFee"
column=
"MANAGEMENT_FEE"
/>
<result
property=
"managementType"
column=
"MANAGEMENT_TYPE"
/>
<result
property=
"managementType"
column=
"MANAGEMENT_TYPE"
/>
<result
property=
"riskFundTag"
column=
"RISK_FUND_TAG"
/>
<result
property=
"riskFundTag"
column=
"RISK_FUND_TAG"
/>
<result
property=
"riskFundFee"
column=
"RISK_FUND_FEE"
/>
<result
property=
"riskFundFee"
column=
"RISK_FUND_FEE"
/>
<result
property=
"riskFundType"
column=
"RISK_FUND_TYPE"
/>
<result
property=
"riskFundType"
column=
"RISK_FUND_TYPE"
/>
<result
property=
"manageServerItem"
column=
"MANAGE_SERVER_ITEM"
/>
<result
property=
"riskServerItem"
column=
"RISK_SERVER_ITEM"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -149,13 +150,14 @@
...
@@ -149,13 +150,14 @@
a.INVOICE_TITLE,
a.INVOICE_TITLE,
a.FUND_TYPE,
a.FUND_TYPE,
a.MR_SETTLE_TYPE,
a.MR_SETTLE_TYPE,
a.MR_SERVER_ITEM,
a.MANAGEMENT_TAG,
a.MANAGEMENT_TAG,
a.MANAGEMENT_FEE,
a.MANAGEMENT_FEE,
a.MANAGEMENT_TYPE,
a.MANAGEMENT_TYPE,
a.RISK_FUND_TAG,
a.RISK_FUND_TAG,
a.RISK_FUND_FEE,
a.RISK_FUND_FEE,
a.RISK_FUND_TYPE
a.RISK_FUND_TYPE,
a.MANAGE_SERVER_ITEM,
a.RISK_SERVER_ITEM
</sql>
</sql>
<resultMap
id=
"tSettleDomainSelectVoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"
>
<resultMap
id=
"tSettleDomainSelectVoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo"
>
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
b7346c87
...
@@ -249,7 +249,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -249,7 +249,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
return
R
.
failed
(
"获取项目信息失败,请联管理员!"
);
return
R
.
failed
(
"获取项目信息失败,请联管理员!"
);
}
}
// 含有薪资,则计算收入
// 含有薪资,则计算收入
if
(
Common
.
isNotNull
(
dept
.
getM
rServerItem
())
&&
dept
.
getMr
ServerItem
().
contains
(
CommonConstants
.
FOUR_STRING
))
{
if
(
Common
.
isNotNull
(
dept
.
getM
anageServerItem
())
&&
dept
.
getManage
ServerItem
().
contains
(
CommonConstants
.
FOUR_STRING
))
{
// 管理费
// 管理费
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
dept
.
getManagementTag
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
dept
.
getManagementTag
()))
{
// 金额-人数
// 金额-人数
...
@@ -291,6 +291,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -291,6 +291,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if
(
failed
!=
null
)
return
failed
;
if
(
failed
!=
null
)
return
failed
;
}
}
}
}
}
if
(
Common
.
isNotNull
(
dept
.
getRiskServerItem
())
&&
dept
.
getRiskServerItem
().
contains
(
CommonConstants
.
FOUR_STRING
))
{
// 风险金
// 风险金
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
dept
.
getRiskFundTag
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
dept
.
getRiskFundTag
()))
{
// 金额-人数
// 金额-人数
...
...
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