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
36bd6552
Commit
36bd6552
authored
Mar 16, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单分项目派单状态处理
parent
242062db
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+10
-5
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
36bd6552
...
...
@@ -65,17 +65,17 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
@Override
public
IPage
<
TEmpContractAlert
>
pageDiy
(
Page
page
,
ContractAlertSearchVo
searchVo
)
{
LambdaQueryWrapper
<
TEmpContractAlert
>
wrapper
=
buildQueryWrapper
(
searchVo
);
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
wrapper
.
last
(
searchVo
.
getAuthSql
()
+
" order by CREATE_TIME desc"
);
}
else
{
wrapper
.
orderByDesc
(
BaseEntity:
:
getCreateTime
);
}
if
(
Common
.
isNotNull
(
searchVo
.
getContractEndStart
())){
wrapper
.
ge
(
TEmpContractAlert:
:
getContractEnd
,
searchVo
.
getContractEndStart
());
}
if
(
Common
.
isNotNull
(
searchVo
.
getContractEndEnd
())){
wrapper
.
le
(
TEmpContractAlert:
:
getContractEnd
,
searchVo
.
getContractEndEnd
());
}
if
(
Common
.
isNotNull
(
searchVo
.
getAuthSql
()))
{
wrapper
.
last
(
searchVo
.
getAuthSql
()
+
" order by CREATE_TIME desc"
);
}
else
{
wrapper
.
orderByDesc
(
BaseEntity:
:
getCreateTime
);
}
return
baseMapper
.
selectPage
(
page
,
wrapper
);
}
...
...
@@ -323,6 +323,11 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
)){
return
;
}
if
(
Common
.
isEmpty
(
project
)){
return
;
}
}
else
{
return
;
}
TEmpContractAlert
alert
=
alertMap
.
get
(
contract
.
getEmpIdcard
()+
CommonConstants
.
DOWN_LINE_STRING
+
contract
.
getDeptNo
());
// 存在多个审核通过的数据 用最新的审核通过的合同覆盖已有的
...
...
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