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
b349c5f8
Commit
b349c5f8
authored
Jun 20, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
基础档案新增字段及必填调整
parent
941a6c87
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
9 deletions
+0
-9
TEmpDisabilityInfoController.java
...ifu/archives/controller/TEmpDisabilityInfoController.java
+0
-6
TEmpDisabilityInfoServiceImpl.java
.../archives/service/impl/TEmpDisabilityInfoServiceImpl.java
+0
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpDisabilityInfoController.java
View file @
b349c5f8
...
...
@@ -102,9 +102,6 @@ public class TEmpDisabilityInfoController {
public
R
<
Boolean
>
save
(
@RequestBody
TEmpDisabilityInfo
tEmpDisabilityInfo
)
{
R
<
Boolean
>
failed
=
getCheckRes
(
tEmpDisabilityInfo
);
if
(
failed
!=
null
)
return
failed
;
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tEmpDisabilityInfo
.
getOtherFlag
())){
tEmpDisabilityInfo
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
}
return
tEmpDisabilityInfoService
.
saveDiy
(
tEmpDisabilityInfo
);
}
...
...
@@ -143,9 +140,6 @@ public class TEmpDisabilityInfoController {
public
R
<
Boolean
>
updateById
(
@RequestBody
TEmpDisabilityInfo
tEmpDisabilityInfo
)
{
R
<
Boolean
>
failed
=
getCheckRes
(
tEmpDisabilityInfo
);
if
(
failed
!=
null
)
return
failed
;
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tEmpDisabilityInfo
.
getOtherFlag
())){
tEmpDisabilityInfo
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
}
return
tEmpDisabilityInfoService
.
updateByIdDiy
(
tEmpDisabilityInfo
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpDisabilityInfoServiceImpl.java
View file @
b349c5f8
...
...
@@ -130,9 +130,6 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 不可为空!"
));
continue
;
}
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getOtherFlag
())){
excel
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
}
// 数据合法情况
insertExcel
(
excel
,
emp
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
...
...
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