Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
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
bffbce58
Commit
bffbce58
authored
Dec 06, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.7.2' into MVP1.7.3
parents
8396f62f
9b89ba88
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
105 additions
and
31 deletions
+105
-31
daprConfig.properties
...yifu-common-dapr/src/main/resources/daprConfig.properties
+63
-25
application-test.yml
...-ekp/yifu-ekp-biz/src/main/resources/application-test.yml
+2
-2
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+7
-0
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+20
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+13
-3
No files found.
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @
bffbce58
dapr.upms.appUrl
=
http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
#\u67E5\u8BE2\u5730\u5740\u6559\u7A0B\uFF1A cd home/data/nginx-mvp-image/mvp/
# vim Default.conf
# \u627E\u5230\u5BF9\u5E94\u7684\u670D\u52A1\u5730\u5740
#dapr.upms.appUrl=http://yifu-auth.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
dapr.upms.appUrl
=
http://localhost:4500/v1.0/invoke/
dapr.upms.appId
=
yifu-upms
dapr.upms.appId
=
yifu-upms
dapr.upms.appPort
=
4000
dapr.upms.httpPort
=
4500
dapr.upms.grpcPort
=
54000
dapr.upms.metricsPort
=
9490
#\u6D4B\u8BD5\u73AF\u5883
#\u6D4B\u8BD5\u73AF\u5883
#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u6
D4B\u8BD5\u73AF\u5883
#\u6
72C\u5730
dapr.check.appUrl
=
http://
yifu-check.qas-mvp.svc.cluster.local:3500
/v1.0/invoke/
dapr.check.appUrl
=
http://
localhost:3522
/v1.0/invoke/
dapr.check.appId
=
yifu-check
dapr.check.appId
=
yifu-check
dapr.check.appPort
=
5022
dapr.check.httpPort
=
3522
dapr.check.grpcPort
=
52022
dapr.check.metricsPort
=
9292
dapr.archives.appUrl
=
http://localhost:3501/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
dapr.archives.appUrl
=
http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.archives.appId
=
yifu-archives
dapr.archives.appId
=
yifu-archives
dapr.archives.appPort
=
5001
dapr.archives.httpPort
=
3501
dapr.archives.grpcPort
=
52001
dapr.archives.metricsPort
=
9091
#\u6D4B\u8BD5\u73AF\u5883
dapr.social.appUrl
=
http://localhost:3502/v1.0/invoke/
dapr.salary.appUrl
=
http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.salary.appId
=
yifu-salary
#\u6D4B\u8BD5\u73AF\u5883
dapr.social.appUrl
=
http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.social.appId
=
yifu-social
dapr.social.appId
=
yifu-social
#\u6D4B\u8BD5\u73AF\u5883-\u5546\u9669\u670D\u52A1
dapr.social.appPort
=
5002
dapr.insurances.appUrl
=
http://yifu-insurances.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.social.httpPort
=
3502
dapr.social.grpcPort
=
52002
dapr.social.metricsPort
=
9092
dapr.salary.appUrl
=
http://localhost:3503/v1.0/invoke/
dapr.salary.appId
=
yifu-salary
dapr.salary.appPort
=
5003
dapr.salary.httpPort
=
3503
dapr.salary.grpcPort
=
52003
dapr.salary.metricsPort
=
9093
dapr.job.appUrl
=
http://localhost:3504/v1.0/invoke/
dapr.job.appId
=
yifu-job
dapr.job.appPort
=
5004
dapr.job.httpPort
=
3504
dapr.job.grpcPort
=
52004
dapr.job.metricsPort
=
9094
dapr.insurances.appUrl
=
http://localhost:3505/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
dapr.insurances.appId
=
yifu-insurances
#\u6D4B\u8BD5\u73AF\u5883-B\u7AEF\u670D\u52A1
dapr.insurances.appPort
=
5005
dapr.business.appUrl
=
http://yifu-business.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.httpPort
=
3505
dapr.business.appId
=
yifu-business
dapr.insurances.grpcPort
=
52005
dapr.insurances.metricsPort
=
9095
#\u6D4B\u8BD5\u73AF\u5883-\u6D88\u606F\u63D0\u9192\u670D\u52A1
dapr.codegen.appUrl
=
http://localhost:5006/v1.0/invoke/
dapr.msg.appUrl
=
http://yifu-msg.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.codegen.appId
=
yifu-codegen
dapr.msg.appId
=
yifu-msg
dapr.codegen.appPort
=
8000
dapr.codegen.httpPort
=
5006
dapr.codegen.grpcPort
=
58000
dapr.codegen.metricsPort
=
9890
#\u6D4B\u8BD5\u73AF\u5883-EKP\u6743\u9650
dapr.permission.appUrl
=
http://localhost:3507/v1.0/invoke/
dapr.permission.appUrl
=
http://yifu-permission.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.permission.appId
=
yifu-permission
dapr.permission.appId
=
yifu-permission
dapr.permission.appPort
=
5027
dapr.permission.httpPort
=
3507
dapr.permission.grpcPort
=
52007
dapr.permission.metricsPort
=
9097
#\u6D4B\u8BD5\u73AF\u5883-EKP
dapr.ekp.appUrl
=
http://localhost:3508/v1.0/invoke/
dapr.ekp.appUrl
=
http://yifu-ekp.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.ekp.appId
=
yifu-ekp
dapr.ekp.appId
=
yifu-ekp
dapr.ekp.appPort
=
5077
dapr.ekp.httpPort
=
3508
dapr.ekp.grpcPort
=
52008
dapr.ekp.metricsPort
=
9098
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1
#dapr.salary.appUrl=http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#dapr.salary.appUrl=http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#dapr.salary.appId=yifu-salary
#dapr.salary.appId=yifu-salary
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/application-test.yml
View file @
bffbce58
...
@@ -73,8 +73,8 @@ spring:
...
@@ -73,8 +73,8 @@ spring:
activate
:
activate
:
on-profile
:
test
on-profile
:
test
redis
:
redis
:
host
:
1
92.168.1.65
host
:
1
27.0.0.1
port
:
22
379
port
:
6
379
password
:
'
@yf_2017'
password
:
'
@yf_2017'
datasource
:
datasource
:
type
:
com.zaxxer.hikari.HikariDataSource
type
:
com.zaxxer.hikari.HikariDataSource
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
bffbce58
...
@@ -597,6 +597,13 @@ public class TPaymentInfo extends BaseEntity {
...
@@ -597,6 +597,13 @@ public class TPaymentInfo extends BaseEntity {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"个人公积金基数"
)
@ExcelProperty
(
"个人公积金基数"
)
private
BigDecimal
personalProidentSet
;
private
BigDecimal
personalProidentSet
;
/**
* 个人公积金比例
*/
@ExcelAttribute
(
name
=
"个人公积金比例"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"个人公积金比例"
)
private
BigDecimal
personalProvidentPercent
;
/**
/**
* 个人公积金费用
* 个人公积金费用
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
bffbce58
...
@@ -475,7 +475,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
...
@@ -475,7 +475,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
private
BigDecimal
providentCardinal
;
private
BigDecimal
providentCardinal
;
/**
/**
*
公积金比例
*
单位公积金比例(原‘公积金比例’)
*/
*/
@ExcelAttribute
(
name
=
"公积金比例"
)
@ExcelAttribute
(
name
=
"公积金比例"
)
@Schema
(
description
=
"公积金比例"
)
@Schema
(
description
=
"公积金比例"
)
...
@@ -484,6 +484,25 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
...
@@ -484,6 +484,25 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
private
BigDecimal
providentPer
;
private
BigDecimal
providentPer
;
/**
* 个人公积金比例
*/
@ExcelAttribute
(
name
=
"个人公积金比例"
)
@Schema
(
description
=
"个人公积金比例"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"个人公积金比例"
)
private
BigDecimal
personalProvidentPer
;
/**
* 单位个人公积金比例是否相同 0 是 1 否
*/
@ExcelAttribute
(
name
=
"单位个人公积金比例是否相同"
,
isNotEmpty
=
true
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"单位个人公积金比例是否相同"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"单位个人公积金比例是否相同"
)
private
BigDecimal
perFlag
;
/**
/**
* 委托备注
* 委托备注
*/
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
bffbce58
...
@@ -1517,7 +1517,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1517,7 +1517,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fund
.
setTrustRemark
(
excel
.
getTrustRemark
());
fund
.
setTrustRemark
(
excel
.
getTrustRemark
());
fund
.
setUnitProvidengCardinal
(
excel
.
getProvidentCardinal
());
fund
.
setUnitProvidengCardinal
(
excel
.
getProvidentCardinal
());
fund
.
setPersonalProvidentCardinal
(
excel
.
getProvidentCardinal
());
fund
.
setPersonalProvidentCardinal
(
excel
.
getProvidentCardinal
());
fund
.
setPersonalProvidentPer
(
excel
.
getProvidentPer
());
fund
.
setUnitProvidentPer
(
excel
.
getProvidentPer
());
fund
.
setUnitProvidentPer
(
excel
.
getProvidentPer
());
fund
.
setProvidentStart
(
excel
.
getProvidentStart
());
fund
.
setProvidentStart
(
excel
.
getProvidentStart
());
if
(
Common
.
isNotNull
(
fundSet
)){
if
(
Common
.
isNotNull
(
fundSet
)){
...
@@ -1551,6 +1550,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1551,6 +1550,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fund
.
setPersonalProvidentFee
(
Common
.
formatMoneyForFund
(
BigDecimalUtils
.
safeMultiply
(
fund
.
getPersonalProvidentCardinal
(),
fund
.
getPersonalProvidentPer
(),
BigDecimal
.
valueOf
(
CommonConstants
.
ONE_OF_PERCENT
.
doubleValue
())),
Integer
.
valueOf
(
fund
.
getFundPayPoint
())));
fund
.
setPersonalProvidentFee
(
Common
.
formatMoneyForFund
(
BigDecimalUtils
.
safeMultiply
(
fund
.
getPersonalProvidentCardinal
(),
fund
.
getPersonalProvidentPer
(),
BigDecimal
.
valueOf
(
CommonConstants
.
ONE_OF_PERCENT
.
doubleValue
())),
Integer
.
valueOf
(
fund
.
getFundPayPoint
())));
}
}
}
}
// 校验公积金比例后会同步excel的个人公积金比例,顺序不要调整了
fund
.
setPersonalProvidentPer
(
excel
.
getPersonalProvidentPer
());
funds
.
put
(
excel
.
getEmpIdcard
(),
fund
);
funds
.
put
(
excel
.
getEmpIdcard
(),
fund
);
}
}
return
false
;
return
false
;
...
@@ -1561,9 +1562,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1561,9 +1562,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Deprecated 对比公积金比例,对应上true false
* @Deprecated 对比公积金比例,对应上true false
**/
**/
private
boolean
checkFundPer
(
List
<
SysPayProportion
>
pays
,
TDispatchImportVo
excel
){
private
boolean
checkFundPer
(
List
<
SysPayProportion
>
pays
,
TDispatchImportVo
excel
){
if
(
Common
.
isNotNull
(
excel
.
getProvidentPer
())
&&
Common
.
isNotNull
(
pays
)){
//单位个人公积金是否一致:perFlag 0是 1 否 2024-12-05 v1.7.3
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getPerFlag
())){
excel
.
setPersonalProvidentPer
(
excel
.
getProvidentPer
());
}
if
(
Common
.
isNotNull
(
excel
.
getProvidentPer
())
&&
Common
.
isNotNull
(
excel
.
getPersonalProvidentPer
())
&&
Common
.
isNotNull
(
pays
)){
for
(
SysPayProportion
per:
pays
){
for
(
SysPayProportion
per:
pays
){
if
(
per
.
getCompanyPro
().
doubleValue
()==
excel
.
getProvidentPer
().
doubleValue
()){
if
(
per
.
getCompanyPro
().
doubleValue
()==
excel
.
getProvidentPer
().
doubleValue
()
&&
per
.
getPersonalPro
().
doubleValue
()==
excel
.
getPersonalProvidentPer
().
doubleValue
()){
return
true
;
return
true
;
}
}
}
}
...
@@ -2528,7 +2536,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2528,7 +2536,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())
&&
(
if
(
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())
&&
(
Common
.
isEmpty
(
excel
.
getProvidentCardinal
())
Common
.
isEmpty
(
excel
.
getProvidentCardinal
())
||
Common
.
isEmpty
(
excel
.
getProvidentStart
())
||
Common
.
isEmpty
(
excel
.
getProvidentStart
())
||
Common
.
isEmpty
(
excel
.
getPerFlag
())
||
Common
.
isEmpty
(
excel
.
getProvidentPer
())
||
Common
.
isEmpty
(
excel
.
getProvidentPer
())
||
(
Common
.
isEmpty
(
excel
.
getPersonalProvidentPer
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPerFlag
()))
))
{
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_FUND_NOT_EMPTY
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_FUND_NOT_EMPTY
)));
return
true
;
return
true
;
...
...
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