Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
5e04b95d
You need to sign in or sign up before continuing.
Commit
5e04b95d
authored
Jan 17, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4
parents
6c1be802
cd49609d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
18 deletions
+20
-18
pom.xml
yifu-archives/yifu-archives-api/pom.xml
+1
-0
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+1
-0
TVacationInfoMapper.xml
...ess-biz/src/main/resources/mapper/TVacationInfoMapper.xml
+18
-18
No files found.
yifu-archives/yifu-archives-api/pom.xml
View file @
5e04b95d
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu
</artifactId>
<artifactId>
yifu
</artifactId>
<version>
1.0.0
</version>
<version>
1.0.0
</version>
<relativePath/>
</parent>
</parent>
<artifactId>
yifu-archives-api
</artifactId>
<artifactId>
yifu-archives-api
</artifactId>
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
5e04b95d
...
@@ -94,6 +94,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -94,6 +94,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
try
{
try
{
for
(
String
userId
:
userIdList
){
for
(
String
userId
:
userIdList
){
redisUtil
.
remove
(
CacheConstants
.
WXHR_SETTLE_DOMAIN_VOS_BY_USERID
+
"_"
+
userId
);
redisUtil
.
remove
(
CacheConstants
.
WXHR_SETTLE_DOMAIN_VOS_BY_USERID
+
"_"
+
userId
);
redisUtil
.
remove
(
CacheConstants
.
WXHR_SETTLE_DOMAIN_NOS_BY_USERID
+
"_"
+
userId
);
// 清空userinfo
// 清空userinfo
Objects
.
requireNonNull
(
cacheManager
.
getCache
(
CacheConstants
.
USER_DETAILS
)).
clear
();
Objects
.
requireNonNull
(
cacheManager
.
getCache
(
CacheConstants
.
USER_DETAILS
)).
clear
();
redisUtil
.
remove
(
CacheConstants
.
USER_DETAILS
+
"::"
+
user
.
getUsername
());
redisUtil
.
remove
(
CacheConstants
.
USER_DETAILS
+
"::"
+
user
.
getUsername
());
...
...
yifu-business/yifu-business-biz/src/main/resources/mapper/TVacationInfoMapper.xml
View file @
5e04b95d
...
@@ -78,11 +78,11 @@
...
@@ -78,11 +78,11 @@
<if
test=
"query.vacationStatus != null and query.vacationStatus.trim() != ''"
>
<if
test=
"query.vacationStatus != null and query.vacationStatus.trim() != ''"
>
<!-- 待休 -->
<!-- 待休 -->
<if
test=
"query.vacationStatus == '0'.toString()"
>
<if
test=
"query.vacationStatus == '0'.toString()"
>
and now()
<![CDATA[<]]>
a.VACATION_START_TIME
and now()
<![CDATA[<]]>
a.VACATION_START_TIME and a.VACATION_STATUS = '4'
</if>
</if>
<!-- 休假中 -->
<!-- 休假中 -->
<if
test=
"query.vacationStatus == '1'.toString()"
>
<if
test=
"query.vacationStatus == '1'.toString()"
>
and now()
<![CDATA[>=]]>
a.VACATION_START_TIME and now()
<![CDATA[<=]]>
a.VACATION_END_TIME
and now()
<![CDATA[>=]]>
a.VACATION_START_TIME and now()
<![CDATA[<=]]>
a.VACATION_END_TIME and a.VACATION_STATUS = '4'
</if>
</if>
<!-- 到期待销假 -->
<!-- 到期待销假 -->
<if
test=
"query.vacationStatus == '2'.toString()"
>
<if
test=
"query.vacationStatus == '2'.toString()"
>
...
...
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