Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-plan
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-plan
Commits
006b4d0c
Commit
006b4d0c
authored
Nov 12, 2024
by
wangqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
季报启动流程
parent
98ef6dd8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
4 deletions
+26
-4
ExtQuarterlyReportController.java
...cs/plan/core/controller/ExtQuarterlyReportController.java
+6
-0
ExtQuarterlyReportService.java
...onde/dcs/plan/core/service/ExtQuarterlyReportService.java
+2
-0
ExtQuarterlyReportServiceImpl.java
...plan/core/service/impl/ExtQuarterlyReportServiceImpl.java
+18
-4
No files found.
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtQuarterlyReportController.java
View file @
006b4d0c
...
@@ -49,6 +49,12 @@ public class ExtQuarterlyReportController<V extends ExtQuarterlyReportVO, S exte
...
@@ -49,6 +49,12 @@ public class ExtQuarterlyReportController<V extends ExtQuarterlyReportVO, S exte
public
ApiResult
startWorkflow
(
@RequestParam
(
"id"
)
Long
id
)
{
public
ApiResult
startWorkflow
(
@RequestParam
(
"id"
)
Long
id
)
{
return
ApiResult
.
ok
(
extQuarterlyReportService
.
startWorkflow
(
id
),
"下发成功!"
);
return
ApiResult
.
ok
(
extQuarterlyReportService
.
startWorkflow
(
id
),
"下发成功!"
);
}
}
@ApiOperation
(
value
=
"修改季报状态"
,
notes
=
"修改季报状态"
,
httpMethod
=
"PUT"
)
@PutMapping
(
value
=
"/changeQPState"
)
public
ApiResult
changeQPState
(
@RequestParam
(
"id"
)
Long
id
)
{
return
ApiResult
.
ok
(
extQuarterlyReportService
.
changeState
(
id
),
"修改成功!"
);
}
}
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtQuarterlyReportService.java
View file @
006b4d0c
...
@@ -31,4 +31,6 @@ public interface ExtQuarterlyReportService<V extends ExtQuarterlyReportVO> exten
...
@@ -31,4 +31,6 @@ public interface ExtQuarterlyReportService<V extends ExtQuarterlyReportVO> exten
* @return
* @return
*/
*/
String
startWorkflow
(
Long
id
);
String
startWorkflow
(
Long
id
);
ExtQuarterlyReportVO
changeState
(
Long
id
);
}
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtQuarterlyReportServiceImpl.java
View file @
006b4d0c
...
@@ -88,7 +88,7 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
...
@@ -88,7 +88,7 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
if
(!
ObjectUtils
.
isEmpty
(
quarterlyReportVOList
))
{
if
(!
ObjectUtils
.
isEmpty
(
quarterlyReportVOList
))
{
ExtQuarterlyReportVO
extQuarterlyReportVO
=
quarterlyReportVOList
.
get
(
0
);
ExtQuarterlyReportVO
extQuarterlyReportVO
=
quarterlyReportVOList
.
get
(
0
);
//取出所有行动项的附件id
//取出所有行动项的附件id
for
(
ExtActionItemVO
extActionItemVO:
extQuarterlyReportVO
.
getExtActionItems
())
{
for
(
ExtActionItemVO
extActionItemVO
:
extQuarterlyReportVO
.
getExtActionItems
())
{
this
.
extFindFileIds
(
fileIds
,
extActionItemVO
.
getObjFileLinks
(),
Constants
.
MASTER_FILE
);
this
.
extFindFileIds
(
fileIds
,
extActionItemVO
.
getObjFileLinks
(),
Constants
.
MASTER_FILE
);
}
}
if
(!
CollectionUtils
.
isEmpty
(
fileIds
))
{
if
(!
CollectionUtils
.
isEmpty
(
fileIds
))
{
...
@@ -109,7 +109,7 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
...
@@ -109,7 +109,7 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
throw
new
DxBusinessException
(
"-1"
,
"根据季报id:"
+
id
+
"未查到报表数据"
);
throw
new
DxBusinessException
(
"-1"
,
"根据季报id:"
+
id
+
"未查到报表数据"
);
}
}
}
else
{
}
else
{
throw
new
DxBusinessException
(
"-1"
,
"根据季报id:"
+
id
+
"未查到季报对象"
);
throw
new
DxBusinessException
(
"-1"
,
"根据季报id:"
+
id
+
"未查到季报对象"
);
}
}
...
@@ -142,7 +142,7 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
...
@@ -142,7 +142,7 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
}
}
//修改季报的状态未信息收集中
//修改季报的状态未信息收集中
this
.
changeStatus
(
extQuarterlyReportVO
.
getId
(),
Constants
.
INFORMATION_COLLECTION
,
true
);
this
.
changeStatus
(
extQuarterlyReportVO
.
getId
(),
Constants
.
INFORMATION_COLLECTION
,
true
);
}
else
{
}
else
{
throw
new
DxBusinessException
(
"-1"
,
"为查到id:"
+
id
+
"的季报对象"
);
throw
new
DxBusinessException
(
"-1"
,
"为查到id:"
+
id
+
"的季报对象"
);
...
@@ -150,6 +150,18 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
...
@@ -150,6 +150,18 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
return
ApiResult
.
SUCCESS
;
return
ApiResult
.
SUCCESS
;
}
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
ExtQuarterlyReportVO
changeState
(
Long
id
)
{
ExtQuarterlyReportVO
extQuarterlyReportVO
=
this
.
get
(
id
);
if
(!
ObjectUtils
.
isEmpty
(
extQuarterlyReportVO
)){
wfcProcessFeign
.
startProcessByKey
(
"ExtQuarterlyReportWF"
,
extQuarterlyReportVO
);
return
this
.
changeStatus
(
id
,
Constants
.
REVIEWING
,
true
);
}
else
{
throw
new
DxBusinessException
(
"-1"
,
"根据id:"
+
id
+
"查询出的对象是空"
);
}
}
/**
/**
* 批量下载季报报表文件
* 批量下载季报报表文件
*
*
...
@@ -173,7 +185,9 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
...
@@ -173,7 +185,9 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
if
(!
CollectionUtils
.
isEmpty
(
objFileLinks
))
{
if
(!
CollectionUtils
.
isEmpty
(
objFileLinks
))
{
//遍历取主内容的文件id
//遍历取主内容的文件id
//List<ObjFileLinkVO> objFileLinkVOs = objFileLinks.stream().filter(n -> n.getContentType().equals(fileType)).collect(Collectors.toList());
//List<ObjFileLinkVO> objFileLinkVOs = objFileLinks.stream().filter(n -> n.getContentType().equals(fileType)).collect(Collectors.toList());
objFileLinks
.
stream
().
forEach
(
o
->
{
fileIds
.
add
(
o
.
getTargetId
());});
objFileLinks
.
stream
().
forEach
(
o
->
{
fileIds
.
add
(
o
.
getTargetId
());
});
}
}
}
}
}
}
...
...
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