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
d5b6d18f
Commit
d5b6d18f
authored
May 06, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10
parents
d54178d6
98ee829d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
ExcelAttributeConstants.java
...v1/yifu/common/core/constant/ExcelAttributeConstants.java
+1
-1
EkpSocialInfoServiceImpl.java
...ud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
+9
-9
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+1
-1
TDispatchReduceVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java
+1
-1
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ExcelAttributeConstants.java
View file @
d5b6d18f
...
...
@@ -164,5 +164,5 @@ public class ExcelAttributeConstants {
public
static
final
String
TRUST_REMARK_REDUCE
=
"trustRemarkReduce"
;
//社保派减委托备注
public
static
final
String
TRUST_REMARK_ADD
=
"trustRemark
Add
"
;
public
static
final
String
TRUST_REMARK_ADD
=
"trustRemark"
;
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSocialInfoServiceImpl.java
View file @
d5b6d18f
...
...
@@ -266,23 +266,23 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfoList
.
add
(
socialInfo
);
//金额累加
//预估单位合计
ygDwSum
=
ygDwSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3adfeb4e8064a8
()));
ygDwSum
=
ygDwSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3adfeb4e8064a8
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3adfeb4e8064a8
()));
//实缴单位合计
sjDwSum
=
sjDwSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f2e9208e4e
()));
sjDwSum
=
sjDwSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f2e9208e4e
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f2e9208e4e
()));
//实缴个人合计
sjPersonSum
=
sjPersonSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f303037214
()));
sjPersonSum
=
sjPersonSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f303037214
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f303037214
()));
//预估合计
ygSum
=
ygSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f2883941b4
()));
ygSum
=
ygSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f2883941b4
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f2883941b4
()));
//预估个人合计
ygPersonSum
=
ygPersonSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f285ee1e38
()));
ygPersonSum
=
ygPersonSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f285ee1e38
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f285ee1e38
()));
//实缴合计
sjSum
=
sjSum
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f3059e5b9c
()));
sjSum
=
sjSum
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3af9f3059e5b9c
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3af9f3059e5b9c
()));
//应收
ys
=
ys
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3adfeb7b624f06
()));
ys
=
ys
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3adfeb7b624f06
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3adfeb7b624f06
()));
//个人应收
personYs
=
personYs
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3b35a57aee1428
()));
personYs
=
personYs
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3b35a57aee1428
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3b35a57aee1428
()));
//单位应收
dwYs
=
dwYs
.
add
(
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3b35a57b6e9d0a
()));
dwYs
=
dwYs
.
add
(
Common
.
isEmpty
(
socialInfo
.
getFd_3b35a57b6e9d0a
())
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
socialInfo
.
getFd_3b35a57b6e9d0a
()));
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialParam
.
getYgFlag
()))
{
stringBuilder
.
append
(
socialParam
.
getSocialIds
()).
append
(
","
);
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
d5b6d18f
...
...
@@ -507,7 +507,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
* 委托备注
*/
@Length
(
max
=
100
,
message
=
"委托备注 不能超过100 个字符"
)
@ExcelAttribute
(
name
=
"委托备注"
,
maxLength
=
100
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
TRUST_REMARK_
REDUCE
)
@ExcelAttribute
(
name
=
"委托备注"
,
maxLength
=
100
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
TRUST_REMARK_
ADD
,
isConvert
=
false
)
@Schema
(
description
=
"委托备注"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"委托备注"
)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java
View file @
d5b6d18f
...
...
@@ -104,7 +104,7 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
/**
* 委托备注
*/
@ExcelAttribute
(
name
=
"委托备注"
,
maxLength
=
200
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
TRUST_REMARK_
ADD
)
@ExcelAttribute
(
name
=
"委托备注"
,
maxLength
=
200
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
TRUST_REMARK_
REDUCE
,
isConvert
=
false
)
@Schema
(
description
=
"委托备注"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"委托备注"
)
...
...
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