Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-doc-expand
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
INET-TWO
server
dcs-doc-expand
Commits
637566ec
Commit
637566ec
authored
Nov 06, 2024
by
wei
🎱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
移交单下文件清单-退档
parent
8a6681c3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
43 deletions
+8
-43
ExtTransferDocumentController.java
...cument/core/controller/ExtTransferDocumentController.java
+8
-15
ExtTransferDocumentService.java
...dcs/document/core/service/ExtTransferDocumentService.java
+0
-2
ExtTransferDocumentServiceImpl.java
...ent/core/service/impl/ExtTransferDocumentServiceImpl.java
+0
-26
No files found.
inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/controller/ExtTransferDocumentController.java
View file @
637566ec
...
@@ -35,20 +35,6 @@ public class ExtTransferDocumentController<V extends ExtTransferDocumentVO, S ex
...
@@ -35,20 +35,6 @@ public class ExtTransferDocumentController<V extends ExtTransferDocumentVO, S ex
return
ApiResult
.
ok
(
extTransferDocumentService
.
startWorkflow
(
id
),
"流程启动成功"
);
return
ApiResult
.
ok
(
extTransferDocumentService
.
startWorkflow
(
id
),
"流程启动成功"
);
}
}
@ApiOperation
(
value
=
"更新案卷部分字段信息"
,
notes
=
"更新案卷部分字段信息"
)
@PostMapping
(
value
=
"/updateExtFiles"
)
public
ApiResult
updateExtFiles
(
@RequestBody
ExtTransferDocumentVO
extTransferDocumentVO
)
{
extTransferDocumentService
.
updateExtFiles
(
extTransferDocumentVO
);
return
ApiResult
.
ok
(
ApiResult
.
SUCCESS
,
"更新案卷部分信息成功"
);
}
@ApiOperation
(
value
=
"保存文档案卷关联关系"
,
notes
=
"保存文档案卷关联关系"
)
@PostMapping
(
value
=
"/saveFilesDocLink"
)
public
ApiResult
saveFilesDocLink
(
@RequestBody
List
<
ExtFilesUpdateVO
>
extFilesUpdateVOList
)
{
extTransferDocumentService
.
saveFilesDocLink
(
extFilesUpdateVOList
);
return
ApiResult
.
ok
(
ApiResult
.
SUCCESS
,
"保存文档案卷关联关系成功"
);
}
@ApiOperation
(
value
=
"获取项目信息"
,
notes
=
"获取项目信息"
)
@ApiOperation
(
value
=
"获取项目信息"
,
notes
=
"获取项目信息"
)
@GetMapping
(
value
=
"/getTransferDocProject"
)
@GetMapping
(
value
=
"/getTransferDocProject"
)
public
ApiResult
getTransferDocProjectById
(
@RequestParam
(
"id"
)
Long
id
)
{
public
ApiResult
getTransferDocProjectById
(
@RequestParam
(
"id"
)
Long
id
)
{
...
@@ -61,7 +47,14 @@ public class ExtTransferDocumentController<V extends ExtTransferDocumentVO, S ex
...
@@ -61,7 +47,14 @@ public class ExtTransferDocumentController<V extends ExtTransferDocumentVO, S ex
return
ApiResult
.
ok
(
extTransferDocumentService
.
getDxDocumentList
(
searchQueryCondition
));
return
ApiResult
.
ok
(
extTransferDocumentService
.
getDxDocumentList
(
searchQueryCondition
));
}
}
@ApiOperation
(
value
=
"移交单下文件清单退档"
,
notes
=
"移交单下文件清单退档"
)
@ApiOperation
(
value
=
"保存文档案卷关联关系"
,
notes
=
"保存文档案卷关联关系"
)
@PostMapping
(
value
=
"/saveFilesDocLink"
)
public
ApiResult
saveFilesDocLink
(
@RequestBody
List
<
ExtFilesUpdateVO
>
extFilesUpdateVOList
)
{
extTransferDocumentService
.
saveFilesDocLink
(
extFilesUpdateVOList
);
return
ApiResult
.
ok
(
ApiResult
.
SUCCESS
,
"保存文档案卷关联关系成功"
);
}
@ApiOperation
(
value
=
"移交单下文件清单-退档"
,
notes
=
"移交单下文件清单退档"
)
@PostMapping
(
value
=
"/returnDocument"
)
@PostMapping
(
value
=
"/returnDocument"
)
public
ApiResult
returnDocument
(
@RequestParam
(
"id"
)
Long
id
,
public
ApiResult
returnDocument
(
@RequestParam
(
"id"
)
Long
id
,
@RequestParam
(
"docId"
)
Long
docId
)
{
@RequestParam
(
"docId"
)
Long
docId
)
{
...
...
inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/service/ExtTransferDocumentService.java
View file @
637566ec
...
@@ -22,8 +22,6 @@ public interface ExtTransferDocumentService<V extends ExtTransferDocumentVO> ext
...
@@ -22,8 +22,6 @@ public interface ExtTransferDocumentService<V extends ExtTransferDocumentVO> ext
ExtTransferDocumentVO
startWorkflow
(
Long
id
);
ExtTransferDocumentVO
startWorkflow
(
Long
id
);
void
updateExtFiles
(
ExtTransferDocumentVO
extTransferDocumentVO
);
ExtTransferDocProjectVO
getTransferDocProjectById
(
Long
id
);
ExtTransferDocProjectVO
getTransferDocProjectById
(
Long
id
);
DxPageImpl
getDxDocumentList
(
SearchQueryCondition
searchQueryCondition
);
DxPageImpl
getDxDocumentList
(
SearchQueryCondition
searchQueryCondition
);
...
...
inet-doc-expand-core/src/main/java/com/inet/dcs/document/core/service/impl/ExtTransferDocumentServiceImpl.java
View file @
637566ec
...
@@ -114,32 +114,6 @@ public class ExtTransferDocumentServiceImpl<V extends ExtTransferDocumentVO> imp
...
@@ -114,32 +114,6 @@ public class ExtTransferDocumentServiceImpl<V extends ExtTransferDocumentVO> imp
return
this
.
changeStatus
(
extTransferDocumentVO
.
getId
(),
Constants
.
SUBMIT_REVIEWING
,
true
);
return
this
.
changeStatus
(
extTransferDocumentVO
.
getId
(),
Constants
.
SUBMIT_REVIEWING
,
true
);
}
}
@Override
public
void
updateExtFiles
(
ExtTransferDocumentVO
extTransferDocumentVO
)
{
// 1.查出移交单文件关联关系
SearchQueryCondition
queryDoc
=
SearchQueryCondition
.
builder
()
.
openProp
(
SearchQueryCondition
.
builder
().
name
(
"source"
).
build
())
.
searchItems
(
SearchItems
.
builder
()
.
item
(
new
SearchItem
(
"targetId"
,
SearchItem
.
Operator
.
EQ
,
extTransferDocumentVO
.
getId
(),
null
))
.
operator
(
SearchItems
.
BooleanOperator
.
AND
).
build
()).
build
();
List
<
ExtTransferDocLinkVO
>
transferDocLinkVOList
=
extTransferDocLinkService
.
findRecursion
(
queryDoc
).
getContent
();
if
(
CollectionUtils
.
isEmpty
(
transferDocLinkVOList
))
{
return
;
}
// todo 2.校验文件档号是否重复
List
<
String
>
distinct
=
transferDocLinkVOList
.
stream
()
.
map
(
ExtTransferDocLinkVO:
:
getArchiveNumber
).
distinct
().
collect
(
Collectors
.
toList
());
if
(
distinct
.
size
()
!=
transferDocLinkVOList
.
size
())
{
throw
new
DxBusinessException
(
"500"
,
"文件清单中:文件归档号寸在重复"
);
}
for
(
ExtTransferDocLinkVO
extTransferDocLinkVO
:
transferDocLinkVOList
)
{
String
archiveNumber
=
extTransferDocLinkVO
.
getArchiveNumber
();
// TODO 查询linK判断是否数据库存在
}
}
@Override
@Override
public
ExtTransferDocProjectVO
getTransferDocProjectById
(
Long
id
)
{
public
ExtTransferDocProjectVO
getTransferDocProjectById
(
Long
id
)
{
ExtTransferDocProjectVO
extTransferDocProjectVO
=
new
ExtTransferDocProjectVO
();
ExtTransferDocProjectVO
extTransferDocProjectVO
=
new
ExtTransferDocProjectVO
();
...
...
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