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
aebd0be4
Commit
aebd0be4
authored
Feb 13, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.6' into MVP1.7.6
parents
a9dbf190
52ebef09
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
10 deletions
+7
-10
PreUploadEmpImportTwoVo.java
...oud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
+2
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-6
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
View file @
aebd0be4
...
...
@@ -187,10 +187,10 @@ public class PreUploadEmpImportTwoVo implements Serializable {
@ExcelAttribute
(
name
=
"身份证截止日期-值"
)
private
Date
validityEndValue
;
@ExcelAttribute
(
name
=
"是否有
职业资格证书
"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"是否有
不良记录
"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
private
String
badRecordFlag
;
@ExcelAttribute
(
name
=
"是否有
不良记录
"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"是否有
职业资格证书
"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
private
String
haveQualification
;
// 字典值结束
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
aebd0be4
...
...
@@ -3824,7 +3824,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
&&
(
"是"
.
equals
(
excel
.
getBadRecordFlag
())
||
"否"
.
equals
(
excel
.
getBadRecordFlag
()))
)
{
String
badFlag
=
CommonConstants
.
ZERO_STRING
;
if
(
"否"
.
equals
(
excel
.
get
HaveQualification
())){
if
(
"否"
.
equals
(
excel
.
get
BadRecordFlag
())){
badFlag
=
CommonConstants
.
ONE_STRING
;
}
badRecord
=
new
TEmpBadRecord
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
aebd0be4
...
...
@@ -1472,7 +1472,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
tPreEmpBadRecord
.
getRemark
())){
if
(
tPreEmpBadRecord
.
getRemark
().
contains
(
"未曾经"
)){
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ONE_STRING
);
}
else
{
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ZERO_STRING
);
}
...
...
@@ -1490,8 +1489,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
.
set
(
TPreEmpBadRecord:
:
getHappenTime
,
null
)
.
set
(
TPreEmpBadRecord:
:
getLoseFee
,
null
)
.
set
(
TPreEmpBadRecord:
:
getLoseFeeOther
,
null
)
.
set
(
TPreEmpBadRecord:
:
getProject
,
null
)
.
set
(
TPreEmpBadRecord:
:
getProjectCode
,
null
)
.
set
(
TPreEmpBadRecord:
:
getUpdateBy
,
user
.
getId
())
.
set
(
TPreEmpBadRecord:
:
getUpdateTime
,
LocalDateTime
.
now
());
tPreEmpBadRecordService
.
update
(
null
,
updateDiyInfoWrapper
);
...
...
@@ -3889,6 +3886,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord
=
new
TPreEmpBadRecord
();
tPreEmpBadRecord
.
setOldId
(
oldBadRecordMap
.
get
(
empIdCard
));
tPreEmpBadRecord
.
setPreMainId
(
mainId
);
tPreEmpBadRecord
.
setSettleDomain
(
deptId
);
tPreEmpBadRecord
.
setProject
(
dept
.
getDepartName
());
tPreEmpBadRecord
.
setProjectCode
(
dept
.
getDepartNo
());
if
(
employee
!=
null
)
{
tPreEmpBadRecord
.
setEmpName
(
employee
.
getEmpName
());
}
...
...
@@ -3898,9 +3898,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord
.
setCreateTime
(
LocalDateTime
.
now
());
if
(
"是"
.
equals
(
info
.
getRemark
()))
{
// 有不良记录,存项目信息
tPreEmpBadRecord
.
setSettleDomain
(
deptId
);
tPreEmpBadRecord
.
setProject
(
dept
.
getDepartName
());
tPreEmpBadRecord
.
setProjectCode
(
dept
.
getDepartNo
());
tPreEmpBadRecord
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
// 1.9.6-chenyuxi: 记录不良记录标识
tPreEmpBadRecord
.
setBadRecordFlag
(
CommonConstants
.
ZERO_STRING
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
aebd0be4
...
...
@@ -363,7 +363,7 @@ public interface CommonConstants {
public
static
final
String
JAR_TYPE
=
"jar"
;
int
BATCH_COUNT
=
100
;
int
BATCH_COUNT1
=
2000
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式(常见错误:1.日期格式:yyyy-MM-dd,2.比例为整数且不含%)"
;
String
IMPORT_DATA_ANALYSIS_ERROR
=
"数据导入解析异常,请检查表数据格式(常见错误:1.日期格式:yyyy-MM-dd,2.比例为整数且不含%
,3涉及金额相关的只能填数字
)"
;
String
IMPORT_DATA_ANALYSIS_ERROR_TWO
=
"数据导入解析异常,请检查表数据格式"
;
String
CREATE_TIME
=
"CREATE_TIME"
;
...
...
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