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
2e074fd1
You need to sign in or sign up before continuing.
Commit
2e074fd1
authored
Aug 01, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature-zhaji
parents
4f892ed7
ff3dee66
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
210 deletions
+8
-210
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+6
-6
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+2
-2
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+0
-6
TPreDispatchInfoMapper.xml
...-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml
+0
-196
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
2e074fd1
...
@@ -720,10 +720,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -720,10 +720,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
}
}
if
(
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
if
(
Common
.
isNotNull
(
excel
.
getProvidentHousehold
())){
socialFund
.
setSettleDomain
(
setInfoVo
.
getId
());
socialFund
.
setSettleDomain
Fund
(
setInfoVo
.
getId
());
socialFund
.
setSettleDomainName
(
setInfoVo
.
getDepartName
());
socialFund
.
setSettleDomainName
Fund
(
setInfoVo
.
getDepartName
());
socialFund
.
setSettleDomainCode
(
setInfoVo
.
getDepartNo
());
socialFund
.
setSettleDomainCode
Fund
(
setInfoVo
.
getDepartNo
());
socialFund
.
setUnitName
(
setInfoVo
.
getCustomerName
());
socialFund
.
setUnitName
Fund
(
setInfoVo
.
getCustomerName
());
socialFund
.
setUnitIdFund
(
setInfoVo
.
getCustomerId
());
socialFund
.
setUnitIdFund
(
setInfoVo
.
getCustomerId
());
socialFund
.
setFundStatus
(
CommonConstants
.
ZERO_STRING
);
socialFund
.
setFundStatus
(
CommonConstants
.
ZERO_STRING
);
socialFund
.
setProvidentStart
(
excel
.
getProvidentStart
());
socialFund
.
setProvidentStart
(
excel
.
getProvidentStart
());
...
@@ -1410,11 +1410,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1410,11 +1410,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
签订期限:无固定期限 合同到期时间、合同期限非必填,合同开始时间必填;
签订期限:无固定期限 合同到期时间、合同期限非必填,合同开始时间必填;
签订期限:固定期限、已完成一定工作任务为期限 合同期限非必填,合同开始时间、合同到期时间都必填*/
签订期限:固定期限、已完成一定工作任务为期限 合同期限非必填,合同开始时间、合同到期时间都必填*/
if
(
Common
.
isNotNull
(
empVo
)){
if
(
Common
.
isNotNull
(
empVo
)){
if
(
Common
Constants
.
ONE_STRING
.
equals
(
empVo
.
getProjectStatus
())
){
if
(
Common
.
isNotNull
(
empVo
.
getProjectStatus
())
&&
empVo
.
getProjectStatus
().
intValue
()
==
CommonConstants
.
ONE_INT
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_PROJECT_NOT_USED
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_PROJECT_NOT_USED
)));
return
true
;
return
true
;
}
}
if
(
Common
Constants
.
ONE_STRING
.
equals
(
empVo
.
getFileStatus
())
){
if
(
Common
.
isNotNull
(
empVo
.
getFileStatus
())
&&
empVo
.
getFileStatus
().
intValue
()
==
CommonConstants
.
ONE_INT
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_NOT_USED
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_EMP_NOT_USED
)));
return
true
;
return
true
;
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
2e074fd1
...
@@ -1125,12 +1125,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -1125,12 +1125,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getPensionAddress
())
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getPensionAddress
())
&&
Common
.
isEmpty
(
tPreDispatchInfo
.
getFundAddress
())
&&
Common
.
isEmpty
(
tPreDispatchInfo
.
getFundAddress
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
&&
CommonConstants
.
ZERO_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
return
"派增的
社保缴纳地与公积金缴纳地不可同时为空
!"
;
return
"派增的
养老数据和公积金数据不能同时为空,请完善
!"
;
}
}
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getPensionAddressReduce
())
if
(
Common
.
isEmpty
(
tPreDispatchInfo
.
getPensionAddressReduce
())
&&
Common
.
isEmpty
(
tPreDispatchInfo
.
getFundAddressReduce
())
&&
Common
.
isEmpty
(
tPreDispatchInfo
.
getFundAddressReduce
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
&&
CommonConstants
.
ONE_STRING
.
equals
(
tPreDispatchInfo
.
getType
()))
{
return
"派减的
社保缴纳地与公积金缴纳地不可同时为空
!"
;
return
"派减的
养老数据和公积金数据不能同时为空,请完善
!"
;
}
}
return
null
;
return
null
;
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
2e074fd1
...
@@ -118,8 +118,6 @@
...
@@ -118,8 +118,6 @@
a.SOCIAL_CREATE_MONTH,
a.SOCIAL_CREATE_MONTH,
a.LOCK_STATUS,
a.LOCK_STATUS,
a.PUSH_STATUS,
a.PUSH_STATUS,
a.SOCIAL_SETTLEMENT_FLAG,
a.FUND_SETTLEMENT_FLAG,
a.SUM_ALL,
a.SUM_ALL,
a.PROVIDENT_PAY_MONTH,
a.PROVIDENT_PAY_MONTH,
a.PROVIDENT_CREATE_MONTH,
a.PROVIDENT_CREATE_MONTH,
...
@@ -139,8 +137,6 @@
...
@@ -139,8 +137,6 @@
a.PROVIDENT_SUM,
a.PROVIDENT_SUM,
a.SOCIAL_SETTLEMENT_ID,
a.SOCIAL_SETTLEMENT_ID,
a.FUND_SETTLEMENT_ID,
a.FUND_SETTLEMENT_ID,
a.SALARY_SOCIAL_FLAG,
a.SALARY_FUND_FLAG,
a.INAUGURAL_TEAM,
a.INAUGURAL_TEAM,
a.TELECOM_NUMBER,
a.TELECOM_NUMBER,
a.SORT_TIME,
a.SORT_TIME,
...
@@ -225,8 +221,6 @@
...
@@ -225,8 +221,6 @@
a.PROVIDENT_SUM,
a.PROVIDENT_SUM,
a.INAUGURAL_TEAM,
a.INAUGURAL_TEAM,
a.TELECOM_NUMBER,
a.TELECOM_NUMBER,
a.SALARY_SOCIAL_FLAG,
a.SALARY_FUND_FLAG,
a.COMPANY_ACCRUAL,
a.COMPANY_ACCRUAL,
a.PERSONAL_ACCRUAL,
a.PERSONAL_ACCRUAL,
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml
View file @
2e074fd1
This diff is collapsed.
Click to expand it.
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