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
f37cbd9a
Commit
f37cbd9a
authored
Mar 26, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8
parents
99cd5287
419dc7e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+1
-4
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
f37cbd9a
...
@@ -155,10 +155,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -155,10 +155,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
vo
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
vo
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getDeptNo
,
vo
.
getDeptNo
())
.
eq
(
TEmployeeProject:
:
getDeptNo
,
vo
.
getDeptNo
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
and
(
obj
->
obj
.
ne
(
TEmployeeProject:
:
getProjectSource
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
or
().
eq
(
TEmployeeProject:
:
getProjectSource
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TEmployeeProject:
:
getStatus
,
CommonConstants
.
ONE_INT
))
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
employeeProject
))
{
if
(
Common
.
isNotNull
(
employeeProject
))
{
vo
.
setProjectTime
(
employeeProject
.
getCreateTime
());
vo
.
setProjectTime
(
employeeProject
.
getCreateTime
());
vo
.
setEmpProjectId
(
employeeProject
.
getId
());
vo
.
setEmpProjectId
(
employeeProject
.
getId
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
f37cbd9a
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
AND a.PROJECT_SOURCE = #{employeeRegistrationPre.dataSource}
AND a.PROJECT_SOURCE = #{employeeRegistrationPre.dataSource}
</if>
</if>
<if
test=
"employeeRegistrationPre.customerUsernameNew != null and employeeRegistrationPre.customerUsernameNew.trim() != ''"
>
<if
test=
"employeeRegistrationPre.customerUsernameNew != null and employeeRegistrationPre.customerUsernameNew.trim() != ''"
>
AND c.CS_NAME = #{employeeRegistration.customerUsernameNew}
AND c.CS_NAME = #{employeeRegistration
Pre
.customerUsernameNew}
</if>
</if>
<if
test=
"employeeRegistrationPre.authSql != null and employeeRegistrationPre.authSql.trim() != ''"
>
<if
test=
"employeeRegistrationPre.authSql != null and employeeRegistrationPre.authSql.trim() != ''"
>
${employeeRegistrationPre.authSql}
${employeeRegistrationPre.authSql}
...
...
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