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
3fcc1c9c
Commit
3fcc1c9c
authored
Feb 17, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: bug调整
parent
4de6b6e2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
5 deletions
+21
-5
TEmpProfessionalQualificationServiceImpl.java
...ervice/impl/TEmpProfessionalQualificationServiceImpl.java
+11
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-3
TEmpProfessionalQualificationMapper.xml
.../resources/mapper/TEmpProfessionalQualificationMapper.xml
+1
-0
TPreEmpBadRecordMapper.xml
...-biz/src/main/resources/mapper/TPreEmpBadRecordMapper.xml
+3
-1
TPreEmpProfessionalQualificationMapper.xml
...sources/mapper/TPreEmpProfessionalQualificationMapper.xml
+3
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpProfessionalQualificationServiceImpl.java
View file @
3fcc1c9c
...
@@ -114,6 +114,17 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
...
@@ -114,6 +114,17 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
// 已有验证报错直接下一个
// 已有验证报错直接下一个
EmpCertificateExcelVO
excel
=
excelVOList
.
get
(
i
);
EmpCertificateExcelVO
excel
=
excelVOList
.
get
(
i
);
// 【是否有职业资格证书】为是,申报年度和职业资格名称必填
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getHaveQualification
())){
if
(
Common
.
isEmpty
(
excel
.
getDeclareYear
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"申报年度_字段不可为空"
));
continue
;
}
if
(
Common
.
isEmpty
(
excel
.
getQualificationType
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"职业资格名称_字段不可为空"
));
continue
;
}
}
if
(
Common
.
isNotNull
(
excel
.
getDeclareYear
())
&&
if
(
Common
.
isNotNull
(
excel
.
getDeclareYear
())
&&
Integer
.
parseInt
(
excel
.
getDeclareYear
())
>
DateUtil
.
getYearOfInt
(
new
Date
())){
Integer
.
parseInt
(
excel
.
getDeclareYear
())
>
DateUtil
.
getYearOfInt
(
new
Date
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_EMP_CERTIFICATE_DECLARE_YEAR_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_EMP_CERTIFICATE_DECLARE_YEAR_ERROR
)));
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
3fcc1c9c
...
@@ -3889,9 +3889,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -3889,9 +3889,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord
.
setSettleDomain
(
deptId
);
tPreEmpBadRecord
.
setSettleDomain
(
deptId
);
tPreEmpBadRecord
.
setProject
(
dept
.
getDepartName
());
tPreEmpBadRecord
.
setProject
(
dept
.
getDepartName
());
tPreEmpBadRecord
.
setProjectCode
(
dept
.
getDepartNo
());
tPreEmpBadRecord
.
setProjectCode
(
dept
.
getDepartNo
());
if
(
employee
!=
null
)
{
tPreEmpBadRecord
.
setEmpName
(
employee
.
getEmpName
());
tPreEmpBadRecord
.
setEmpName
(
main
.
getEmpName
());
}
tPreEmpBadRecord
.
setEmpId
(
empId
);
tPreEmpBadRecord
.
setEmpIdcard
(
empIdCard
);
tPreEmpBadRecord
.
setEmpIdcard
(
empIdCard
);
tPreEmpBadRecord
.
setCreateBy
(
user
.
getId
());
tPreEmpBadRecord
.
setCreateBy
(
user
.
getId
());
tPreEmpBadRecord
.
setCreateName
(
user
.
getNickname
());
tPreEmpBadRecord
.
setCreateName
(
user
.
getNickname
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpProfessionalQualificationMapper.xml
View file @
3fcc1c9c
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"haveQualification"
column=
"HAVE_QUALIFICATION"
/>
</resultMap>
</resultMap>
<!--删除-->
<!--删除-->
<delete
id=
"deleteProfessionalByEmpId"
>
<delete
id=
"deleteProfessionalByEmpId"
>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpBadRecordMapper.xml
View file @
3fcc1c9c
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"settleDomain"
column=
"SETTLE_DOMAIN"
/>
<result
property=
"settleDomain"
column=
"SETTLE_DOMAIN"
/>
<result
property=
"oldId"
column=
"OLD_ID"
/>
<result
property=
"oldId"
column=
"OLD_ID"
/>
<result
property=
"badRecordFlag"
column=
"BAD_RECORD_FLAG"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
@@ -61,7 +62,8 @@
...
@@ -61,7 +62,8 @@
a.CREATE_TIME,
a.CREATE_TIME,
a.UPDATE_TIME,
a.UPDATE_TIME,
a.OLD_ID,
a.OLD_ID,
a.SETTLE_DOMAIN
a.SETTLE_DOMAIN,
a.BAD_RECORD_FLAG
</sql>
</sql>
<sql
id=
"tPreEmpBadRecord_where"
>
<sql
id=
"tPreEmpBadRecord_where"
>
<if
test=
"tPreEmpBadRecord != null"
>
<if
test=
"tPreEmpBadRecord != null"
>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpProfessionalQualificationMapper.xml
View file @
3fcc1c9c
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"oldId"
column=
"OLD_ID"
/>
<result
property=
"oldId"
column=
"OLD_ID"
/>
<result
property=
"haveQualification"
column=
"HAVE_QUALIFICATION"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
@@ -69,7 +70,8 @@
...
@@ -69,7 +70,8 @@
a.CREATE_TIME,
a.CREATE_TIME,
a.UPDATE_TIME,
a.UPDATE_TIME,
a.OLD_ID,
a.OLD_ID,
a.REMARK
a.REMARK,
a.HAVE_QUALIFICATION
</sql>
</sql>
<sql
id=
"tPreEmpProfessionalQualification_where"
>
<sql
id=
"tPreEmpProfessionalQualification_where"
>
<if
test=
"tPreEmpProfessionalQualification != null"
>
<if
test=
"tPreEmpProfessionalQualification != null"
>
...
...
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