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
262d6b7f
Commit
262d6b7f
authored
Oct 23, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.0 优化
parent
45cbeee7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
19 deletions
+20
-19
TPreEmployeeInfo.java
.../cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
+1
-1
EmployeeInsertVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmployeeInsertVO.java
+2
-2
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+17
-16
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
View file @
262d6b7f
...
...
@@ -130,7 +130,7 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"出生日期"
,
isDate
=
true
)
@ExcelProperty
(
"出生日期"
)
@Schema
(
description
=
"出生日期"
)
private
Date
empBirthday
;
private
java
.
sql
.
Date
empBirthday
;
/**
* 年龄
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeInsertVO.java
View file @
262d6b7f
...
...
@@ -245,7 +245,7 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
@ExcelProperty
(
value
=
"通信地址-详细地址"
)
private
String
contactAddress
;
/*
// 紧急联系人姓名 与本人关系 联系地址-省 联系地址-市 联系地址-区/县 联系地址-详细地址 手机号码(紧急联系人)
@ExcelAttribute(name = "紧急联系人姓名", isNotEmpty = true, errorInfo = "紧急联系人姓名不能为空", maxLength = 20)
private String contactEmpName;
...
...
@@ -274,6 +274,6 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
@ExcelAttribute(name = "开户支行", maxLength = 50)
private String bankSubName;
@ExcelAttribute(name = "计税月份", isDate = true, dateFormat = "yyyyMM", maxLength = 6)
private
String
taxMonth
;
private String taxMonth;
*/
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
262d6b7f
...
...
@@ -893,18 +893,20 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return
R
.
failed
(
"状态不为待完善,不可编辑!"
);
}
String
errorInfo
=
null
;
if
(
Common
.
isEmpty
(
tPreEmployee
.
getEmpNatrue
()))
{
errorInfo
=
"【员工类型】"
;
}
if
(
Common
.
isEmpty
(
tPreEmployee
.
getFileProvince
()))
{
errorInfo
+=
"【档案地省】"
;
}
if
(
Common
.
isNotNull
(
errorInfo
))
{
return
R
.
failed
(
errorInfo
+
"不可为空!"
);
}
// 计税月份
if
(
Common
.
isNotNull
(
tPreEmployee
.
getBankNo
())
&&
Common
.
isEmpty
(
tPreEmployee
.
getTaxMonth
()))
{
return
R
.
failed
(
"有银行卡号,计税月份必填!"
);
if
(
Common
.
isNotNull
(
preMain
.
getStatus
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
preMain
.
getStatus
()))
{
if
(
Common
.
isEmpty
(
tPreEmployee
.
getEmpNatrue
()))
{
errorInfo
=
"【员工类型】"
;
}
if
(
Common
.
isEmpty
(
tPreEmployee
.
getFileProvince
()))
{
errorInfo
+=
"【档案地省】"
;
}
if
(
Common
.
isNotNull
(
errorInfo
))
{
return
R
.
failed
(
errorInfo
+
"不可为空!"
);
}
// 计税月份
if
(
Common
.
isNotNull
(
tPreEmployee
.
getBankNo
())
&&
Common
.
isEmpty
(
tPreEmployee
.
getTaxMonth
()))
{
return
R
.
failed
(
"有银行卡号,计税月份必填!"
);
}
}
if
(
Common
.
isNotNull
(
tPreEmployee
.
getTaxMonth
()))
{
String
taxMonth
=
tPreEmployee
.
getTaxMonth
().
trim
();
...
...
@@ -955,7 +957,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
else
{
this
.
updateById
(
main
);
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
main
.
getSourType
()))
{
// 更新其他附件信息 fxj 2024-09-09
updateOtherAtta
(
preMain
);
...
...
@@ -1963,8 +1964,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
idCard
)
&&
Common
.
isEmpty
(
employeeInfo
.
getEmpSex
())
&&
idCard
.
length
()
>
14
)
{
// 出生日期
String
idCardDate
=
idCard
.
substring
(
6
,
14
);
Date
empBirthday
=
DateUtil
.
stringDateFormat
(
idCardDate
,
"yyyyMMdd"
);
java
.
sql
.
Date
empBirthday
=
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
util
.
IdCardUtil
.
getBirthdate
(
idCard
);
employeeInfo
.
setEmpBirthday
(
empBirthday
);
// 性别
...
...
@@ -3127,7 +3127,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
tPreEmployeeInfo
.
setEmpNatrue
(
info
.
getEmpNatrueValue
());
tPreEmployeeInfo
.
setEmpSex
(
IdCardUtil
.
getSex
(
empIdCard
));
tPreEmployeeInfo
.
setEmpBirthday
(
IdCardUtil
.
getBirthdate
(
empIdCard
));
java
.
sql
.
Date
empBirthday
=
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
util
.
IdCardUtil
.
getBirthdate
(
empIdCard
);
tPreEmployeeInfo
.
setEmpBirthday
(
empBirthday
);
tPreEmployeeInfo
.
setEmpAge
(
IdCardUtil
.
IdNOToAge
(
empIdCard
));
tPreEmployeeInfo
.
setEmpMarriStatus
(
info
.
getEmpMarriStatusValue
());
tPreEmployeeInfo
.
setEmpNational
(
info
.
getEmpNationalValue
());
...
...
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