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
1d06b323
Commit
1d06b323
authored
Jul 17, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.7-其他附件+监控
parent
b233a29c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
10 deletions
+32
-10
TEmpOtherFile.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmpOtherFile.java
+5
-5
TPreEmpOtherFile.java
.../cloud/plus/v1/yifu/archives/entity/TPreEmpOtherFile.java
+5
-5
TPreEmpMainVo.java
...om/yifu/cloud/plus/v1/yifu/archives/vo/TPreEmpMainVo.java
+3
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+19
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpOtherFile.java
View file @
1d06b323
...
...
@@ -56,12 +56,12 @@ public class TEmpOtherFile {
@Schema
(
description
=
"员工主键"
)
private
String
empId
;
/**
*
员工姓名
*
附件名称
*/
@ExcelAttribute
(
name
=
"
员工姓名
"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"
员工姓名
不能超过32个字符"
)
@ExcelProperty
(
"
员工姓名
"
)
@Schema
(
description
=
"
员工姓名
"
)
@ExcelAttribute
(
name
=
"
附件名称
"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"
附件名称
不能超过32个字符"
)
@ExcelProperty
(
"
附件名称
"
)
@Schema
(
description
=
"
附件名称
"
)
private
String
attaName
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmpOtherFile.java
View file @
1d06b323
...
...
@@ -66,12 +66,12 @@ public class TPreEmpOtherFile {
@Schema
(
description
=
"员工主键"
)
private
String
empId
;
/**
*
员工姓名
*
附件名称
*/
@ExcelAttribute
(
name
=
"
员工姓名
"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"
员工姓名
不能超过32个字符"
)
@ExcelProperty
(
"
员工姓名
"
)
@Schema
(
description
=
"
员工姓名
"
)
@ExcelAttribute
(
name
=
"
附件名称
"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"
附件名称
不能超过32个字符"
)
@ExcelProperty
(
"
附件名称
"
)
@Schema
(
description
=
"
附件名称
"
)
private
String
attaName
;
/**
* 原ID
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TPreEmpMainVo.java
View file @
1d06b323
...
...
@@ -57,5 +57,8 @@ public class TPreEmpMainVo extends RowIndex implements Serializable {
@ExcelAttribute
(
name
=
"档案所在地县"
,
isArea
=
true
,
parentField
=
"fileCity"
)
@ExcelProperty
(
"档案所在地县"
)
private
String
fileTown
;
@ExcelAttribute
(
name
=
"计税月份"
)
@ExcelProperty
(
"计税月份"
)
private
String
taxMonth
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
1d06b323
...
...
@@ -62,6 +62,7 @@ import java.net.URL;
import
java.net.URLEncoder
;
import
java.time.LocalDateTime
;
import
java.util.*
;
import
java.util.regex.Pattern
;
/**
* 预入职-主表
...
...
@@ -133,6 +134,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
private
static
final
String
ID
=
"id"
;
public
static
final
String
taxMonthRegex
=
"^2\\d{5}"
;
/**
* 预入职-主表简单分页查询
*
...
...
@@ -1931,6 +1934,20 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
project
==
null
||
Common
.
isEmpty
(
project
.
getId
()))
{
errorMessageList
.
add
(
new
ErrorMessage
<>(
excel
.
getRowIndex
(),
"未找到预入职项目档案表!"
));
}
else
{
if
(
Common
.
isNotNull
(
employee
.
getBankNo
())
&&
Common
.
isEmpty
(
excel
.
getTaxMonth
()))
{
errorMessageList
.
add
(
new
ErrorMessage
<>(
excel
.
getRowIndex
(),
"有银行卡号,计税月份必填!"
));
continue
;
}
if
(
Common
.
isNotNull
(
excel
.
getTaxMonth
()))
{
String
taxMonth
=
excel
.
getTaxMonth
().
trim
();
if
(!
taxMonth
.
matches
(
taxMonthRegex
))
{
errorMessageList
.
add
(
new
ErrorMessage
<>(
excel
.
getRowIndex
(),
"计税月份为6位年月,例如:202407!"
));
continue
;
}
if
(
Common
.
isEmpty
(
employee
.
getTaxMonthFlag
())
||
CommonConstants
.
ONE_STRING
.
equals
(
employee
.
getTaxMonthFlag
()))
{
employee
.
setTaxMonth
(
excel
.
getTaxMonth
());
}
}
employee
.
setEmpNatrue
(
excel
.
getEmpNatrue
());
project
.
setEmpNatrue
(
excel
.
getEmpNatrue
());
employee
.
setFileProvince
(
Integer
.
parseInt
(
excel
.
getFileProvince
()));
...
...
@@ -1941,6 +1958,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
employee
.
setFileCity
(
Integer
.
parseInt
(
excel
.
getFileCity
()));
}
catch
(
Exception
e
)
{
errorMessageList
.
add
(
new
ErrorMessage
<>(
excel
.
getRowIndex
(),
"未找到市!"
));
continue
;
}
}
if
(
Common
.
isEmpty
(
excel
.
getFileTown
()))
{
...
...
@@ -1950,6 +1968,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
employee
.
setFileTown
(
Integer
.
parseInt
(
excel
.
getFileTown
()));
}
catch
(
Exception
e
)
{
errorMessageList
.
add
(
new
ErrorMessage
<>(
excel
.
getRowIndex
(),
"未找到县!"
));
continue
;
}
}
tPreEmployeeInfoService
.
updateById
(
employee
);
...
...
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