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
3185e4c6
You need to sign in or sign up before continuing.
Commit
3185e4c6
authored
Mar 01, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
453188b4
5f92ecf4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
101 additions
and
143 deletions
+101
-143
TSalaryEmployee.java
...ifu/cloud/plus/v1/yifu/salary/entity/TSalaryEmployee.java
+4
-0
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+17
-7
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+1
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+77
-134
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+2
-2
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryEmployee.java
View file @
3185e4c6
...
...
@@ -205,4 +205,8 @@ public class TSalaryEmployee extends BaseEntity {
@TableField
(
exist
=
false
)
private
Integer
lineNums
;
// 是否暂停发0立即发、1暂停发
@TableField
(
exist
=
false
)
private
String
salaryGiveTime
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
3185e4c6
...
...
@@ -299,7 +299,11 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
List
<
String
>
phoneList
=
new
ArrayList
<>();
TCheckBankNo
checkBankNo
;
for
(
TSalaryEmployee
employee
:
saveNewEmpList
)
{
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
(
Common
.
isEmpty
(
employee
.
getIssueStatus
())
||
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ZERO_INT
)))
{
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
(
Common
.
isEmpty
(
employee
.
getIssueStatus
())
||
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ZERO_INT
))
&&
(
Common
.
isEmpty
(
employee
.
getSalaryGiveTime
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
&&
Common
.
isNotNull
(
employee
.
getBankNo
()))))
{
checkBankNo
=
new
TCheckBankNo
();
checkBankNo
.
setName
(
employee
.
getEmpName
());
checkBankNo
.
setBankNo
(
employee
.
getBankNo
());
...
...
@@ -330,14 +334,20 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
boolean
isFalse
=
false
;
for
(
TSalaryEmployee
employee
:
saveNewEmpList
)
{
if
(
bankMap
.
get
(
employee
.
getBankNo
())
!=
null
)
{
if
(
Boolean
.
FALSE
.
equals
(
bankMap
.
get
(
employee
.
getBankNo
())))
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建失败:【姓名与卡号验证:认证不一致】"
));
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
(
Common
.
isEmpty
(
employee
.
getIssueStatus
())
||
employee
.
getIssueStatus
().
equals
(
CommonConstants
.
ZERO_INT
))
&&
(
Common
.
isEmpty
(
employee
.
getSalaryGiveTime
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
||
(
CommonConstants
.
ONE_STRING
.
equals
(
employee
.
getSalaryGiveTime
())
&&
Common
.
isNotNull
(
employee
.
getBankNo
()))))
{
if
(
bankMap
.
get
(
employee
.
getBankNo
())
!=
null
)
{
if
(
Boolean
.
FALSE
.
equals
(
bankMap
.
get
(
employee
.
getBankNo
())))
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建失败:【姓名与卡号验证:认证不一致】"
));
isFalse
=
true
;
}
}
else
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建失败:【姓名与卡号验证:"
+
SalaryConstants
.
CHECK_NO_RESPONSE
+
"】"
));
isFalse
=
true
;
}
}
else
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建失败:【姓名与卡号验证:"
+
SalaryConstants
.
CHECK_NO_RESPONSE
+
"】"
));
isFalse
=
true
;
}
if
(
phoneMap
.
get
(
employee
.
getEmpPhone
())
!=
null
)
{
if
(
Boolean
.
FALSE
.
equals
(
phoneMap
.
get
(
employee
.
getEmpPhone
())))
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
3185e4c6
...
...
@@ -473,6 +473,7 @@ public class SalaryAccountUtil implements Serializable {
,
entity
.
getSaiList
()))
{
continue
;
}
newEmps
.
setSalaryGiveTime
(
entity
.
getSalaryGiveTime
());
saveNewEmpList
.
add
(
newEmps
);
checkTaxMonthList
.
add
(
newEmps
.
getEmpIdcard
());
}
else
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
3185e4c6
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
3185e4c6
...
...
@@ -103,8 +103,8 @@
<result
property=
"isIncomeStatus"
column=
"IS_INCOME_STATUS"
/>
<result
property=
"incomeSettleFlag"
column=
"INCOME_SETTLE_FLAG"
/>
<result
property=
"incomeCollectFlag"
column=
"INCOME_COLLECT_FLAG"
/>
<result
property=
"paySettleFlag"
column=
"PAY_
COLLECT
_FLAG"
/>
<result
property=
"payCollectFlag"
column=
"PAY_
SETTLE
_FLAG"
/>
<result
property=
"paySettleFlag"
column=
"PAY_
SETTLE
_FLAG"
/>
<result
property=
"payCollectFlag"
column=
"PAY_
COLLECT
_FLAG"
/>
</resultMap>
<resultMap
id=
"tPaymentInfoSumMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo"
>
<result
property=
"empName"
column=
"EMP_NAME"
/>
...
...
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