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
316a382d
Commit
316a382d
authored
Jul 05, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
8d560022
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
6 deletions
+18
-6
SysBaseSetInfo.java
...yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java
+1
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+17
-5
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java
View file @
316a382d
...
...
@@ -231,7 +231,7 @@ public class SysBaseSetInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"是否同一基数上下限: 0是;1否"
)
@Schema
(
description
=
"是否同一基数上下限: 0是;1否"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否同一基数上下限: 0
收取;1不收取
"
)
@ExcelProperty
(
"是否同一基数上下限: 0
是;1否
"
)
private
String
isSameBase
;
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
316a382d
...
...
@@ -2600,12 +2600,24 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
CommonConstants
.
TWO_STRING
.
equals
(
excel
.
getPaymentType
())){
excel
.
setPensionCardinal
(
socialSet
.
getUpPersion
());
}
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
(
excel
.
getPensionCardinal
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
return
true
;
//最低最高时候去校验时候去校验
if
(
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
((
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getPaymentType
())
&&
(
socialSet
.
getLowerPersion
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getLowerMedical
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getLowerUnemployment
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getLowerInjury
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getLowerBirth
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getLowerBig
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
))
||
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
(
socialSet
.
getUpPersion
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getUpMedical
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getUpUnemployment
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getUpInjury
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getUpBirth
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
||
socialSet
.
getUpBig
().
compareTo
(
excel
.
getRecordBase
())
!=
CommonConstants
.
ZERO_INT
)))){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
return
true
;
}
}
return
false
;
}
...
...
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