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
83c8de2a
Commit
83c8de2a
authored
Jun 28, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :档案和社保处Bug修复
parent
d6dcde1c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+3
-4
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+2
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
83c8de2a
...
...
@@ -368,14 +368,13 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
List
<
FeedBackDetail
>
list
=
feedbackDetailMapper
.
getAll
();
for
(
FeedBackDetail
feedBackDetail
:
list
)
{
FeedBackDetail
feedBackDetail1
=
feedbackDetailMapper
.
findByApplyNo
(
feedBackDetail
.
getApplyNo
());
if
(
Objects
.
equals
(
feedBackDetail
.
getApplyNo
(),
contract
.
getApplyNo
()))
{
if
(
feedBackDetail1
.
getIsFeedback
().
equals
(
CommonConstants
.
ONE_INT
))
{
alert
.
setIsFeedback
(
CommonConstants
.
ONE_INT
);
if
(
null
!=
feedbackDetailMapper
.
findByApplyNo
(
contract
.
getApplyNo
())){
alert
.
setIsFeedback
(
feedBackDetail1
.
getIsFeedback
());
alert
.
setFeedbackDetail
(
feedBackDetail1
.
getFeedbackDetail
());
alert
.
setFeedbackReason
(
feedBackDetail1
.
getFeedbackReason
());
alert
.
setFeedbackPerson
(
feedBackDetail1
.
getFeedbackPerson
());
alert
.
setFeedbackTime
(
feedBackDetail1
.
getFeedbackTime
());
}
}
else
{
alert
.
setIsFeedback
(
CommonConstants
.
ZERO_INT
);
}
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
83c8de2a
...
...
@@ -150,7 +150,8 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
/**
* 通信地址
*/
@Length
(
max
=
200
,
message
=
"通信地址不能超过200个字符"
)
@ExcelAttribute
(
name
=
"通信地址"
,
maxLength
=
200
)
@Schema
(
description
=
"通信地址"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址"
)
...
...
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