Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
self-service
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
廖旭伟
self-service
Commits
52205668
Commit
52205668
authored
Dec 05, 2023
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
事项申请材料查询条件增加deptCode
parent
e3aa79c2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
1 deletion
+26
-1
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java
...com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java
+6
-0
sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
...hx/module/matter/service/impl/MatterDatumServiceImpl.java
+20
-1
No files found.
sst-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java
View file @
52205668
...
...
@@ -20,4 +20,10 @@ public class MatterDatumVo extends BaseEntityLong {
private
List
<
Long
>
idList
;
/** 是否加入公共库 0否1是 */
private
Integer
isAddLibrary
;
/**
* 部门编码
*/
private
String
deptCode
;
/** 事项id列表 */
private
List
<
Long
>
matterIdList
;
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
View file @
52205668
...
...
@@ -3,9 +3,12 @@ import com.mortals.framework.common.Rest;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.xhx.base.system.upload.service.UploadService
;
import
com.mortals.xhx.common.utils.BeanUtil
;
import
com.mortals.xhx.common.utils.StringUtils
;
import
com.mortals.xhx.module.matter.model.*
;
import
com.mortals.xhx.module.matter.service.DatumLibraryService
;
import
com.mortals.xhx.module.matter.service.MatterApplyService
;
import
com.mortals.xhx.module.matter.service.MatterDatumFileService
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
...
...
@@ -13,7 +16,6 @@ import com.mortals.framework.exception.AppException;
import
com.mortals.framework.model.Context
;
import
com.mortals.xhx.module.matter.dao.MatterDatumDao
;
import
com.mortals.xhx.module.matter.service.MatterDatumService
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.ObjectUtils
;
import
java.util.ArrayList
;
...
...
@@ -38,6 +40,23 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
private
UploadService
uploadService
;
@Autowired
private
DatumLibraryService
datumLibraryService
;
@Autowired
private
MatterApplyService
matterApplyService
;
@Override
protected
MatterDatumEntity
findBefore
(
MatterDatumEntity
params
,
PageInfo
pageInfo
,
Context
context
)
throws
AppException
{
if
(
StringUtils
.
isNotEmpty
(
params
.
getDeptCode
())){
List
<
MatterApplyEntity
>
list
=
matterApplyService
.
find
(
new
MatterApplyQuery
().
deptCode
(
params
.
getDeptCode
()));
if
(
CollectionUtils
.
isNotEmpty
(
list
)){
List
<
Long
>
matterIdList
=
new
ArrayList
<>();
list
.
stream
().
forEach
(
item
->{
matterIdList
.
add
(
item
.
getId
());
});
params
.
setMatterIdList
(
matterIdList
);
}
}
return
params
;
}
@Override
protected
void
findAfter
(
MatterDatumEntity
params
,
Context
context
,
List
<
MatterDatumEntity
>
list
)
throws
AppException
{
...
...
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