Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
ef3535a5
Commit
ef3535a5
authored
Jan 10, 2024
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改注释
parent
99782720
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
8 deletions
+19
-8
TaskModelDto.java
...com/yeejoin/amos/boot/module/jg/api/dto/TaskModelDto.java
+15
-4
CommonServiceImpl.java
...os/boot/module/jg/biz/service/impl/CommonServiceImpl.java
+4
-4
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TaskModelDto.java
View file @
ef3535a5
...
...
@@ -5,6 +5,9 @@ import lombok.Data;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* @author Administrator
*/
@Data
public
class
TaskModelDto
{
/**
...
...
@@ -19,7 +22,15 @@ public class TaskModelDto {
* 任务编号 可以使用申请单编号
* */
private
String
taskCode
;
/**
* 备注-非必输
*/
private
String
taskContent
;
/**
* 摘要-来源
*/
private
String
taskDesc
;
/**
* 任务类型 例如 安全告知
...
...
@@ -46,22 +57,22 @@ public class TaskModelDto {
* */
private
String
taskStatusLabel
;
/**
* 任务发起人 不变 第一次提交的人
* 任务发起人
id
不变 第一次提交的人
* 从业务表中 created_uesr_id
* */
private
String
startUserId
;
/**
* 任务发起人 不变
* 任务发起人
名称
不变
* 名字
* */
private
String
startUser
;
/**
* 任务发起人所在单位
* 任务发起人所在单位
不变
*
* */
private
String
startUserCompanyName
;
/**
* 任务发起人发起时间
* 任务发起人发起时间
不变
*
* */
private
Date
startDate
;
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java
View file @
ef3535a5
...
...
@@ -669,10 +669,10 @@ public class CommonServiceImpl implements ICommonService {
return
model
;
}
/**
* 待办 撤回
* id 工作流实例id
**/
/**
* 待办 撤回
* id 工作流实例id
**/
public
void
rollbackTask
(
String
id
){
List
<
TaskV2Model
>
result
=
Systemctl
.
taskV2Client
.
selectListByRelationId
(
id
).
getResult
();
List
<
TaskV2Model
>
list
=
result
.
stream
().
sorted
((
r1
,
r2
)
->
r2
.
getSequenceNbr
().
compareTo
(
r1
.
getSequenceNbr
())).
collect
(
Collectors
.
toList
());
...
...
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