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
60ce3fb3
Commit
60ce3fb3
authored
Jul 21, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.6' into MVP1.5.6
parents
262f63b3
0e42592b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
MsgInfoServiceImpl.java
...fu/cloud/plus/v1/msg/service/impl/MsgInfoServiceImpl.java
+3
-2
MsgInfoMapper.xml
.../yifu-msg-biz/src/main/resources/mapper/MsgInfoMapper.xml
+1
-4
No files found.
yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/impl/MsgInfoServiceImpl.java
View file @
60ce3fb3
...
...
@@ -38,6 +38,7 @@ import java.util.ArrayList;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
*
...
...
@@ -146,7 +147,7 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
saves
.
add
(
ms
);
}
if
(
Common
.
isNotNull
(
tempMap
)){
this
.
removeByIds
(
tempMap
.
values
());
this
.
removeByIds
(
tempMap
.
values
()
.
stream
().
map
(
MsgInfo:
:
getId
).
collect
(
Collectors
.
toList
())
);
}
if
(
Common
.
isNotNull
(
saves
)){
this
.
saveBatch
(
saves
);
...
...
@@ -200,7 +201,7 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
saves
.
add
(
ms
);
}
if
(
Common
.
isNotNull
(
tempMap
)){
this
.
removeByIds
(
tempMap
.
values
());
this
.
removeByIds
(
tempMap
.
values
()
.
stream
().
map
(
MsgInfo:
:
getId
).
collect
(
Collectors
.
toList
())
);
}
this
.
saveBatch
(
saves
);
}
...
...
yifu-msg/yifu-msg-biz/src/main/resources/mapper/MsgInfoMapper.xml
View file @
60ce3fb3
...
...
@@ -127,7 +127,7 @@
e.fd_fact_node_id = 'N5'
AND b1.fd_id IS NOT NULL
) x
where x.date1 > date2
where x.date1 > date2
GROUP BY x.ORDER_NO
</select>
<select
id=
"getMsgByTaskOne"
resultMap=
"msgInfoMap"
>
...
...
@@ -140,9 +140,6 @@
b1.fd_3bddc3d6c8a734
FROM
ekp_ea33075576149bb8a4f5 b1
LEFT JOIN lbpm_process p ON p.fd_model_id = b1.fd_id
LEFT JOIN lbpm_node e ON p.fd_id = e.fd_process_id
LEFT JOIN lbpm_audit_note a ON p.fd_id=a.fd_process_id and a.fd_fact_node_id='N5'
LEFT JOIN sys_org_element o ON o.fd_id = b1.fd_3bf1511f1d618e
WHERE
b1.fd_3bddc3d6c8a734 = '待支出'
...
...
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