Skip to content

Commit 72c686b

Browse files
committed
feat: Approval record detail
1 parent 419e248 commit 72c686b

9 files changed

Lines changed: 359 additions & 58 deletions

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package cn.cordys.crm.approval.constants;
2+
3+
public enum ApprovalStatus {
4+
5+
/** 已通过 */
6+
PASS,
7+
/** 已驳回 */
8+
REJECT,
9+
/** 审批中 */
10+
APPROVING,
11+
/** 待审批 */
12+
PENDING,
13+
/** 已撤销 */
14+
REVOKED
15+
}

backend/crm/src/main/java/cn/cordys/crm/approval/domain/ApprovalAddSignTask.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
@Table(name = "approval_add_sign_task")
1313
public class ApprovalAddSignTask extends BaseModel {
1414

15-
@Schema(description = "审批实例ID")
16-
private String instanceId;
17-
1815
@Schema(description = "加签任务ID")
1916
private String taskId;
2017

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package cn.cordys.crm.approval.domain;
2+
3+
import cn.cordys.common.domain.BaseModel;
4+
import io.swagger.v3.oas.annotations.media.Schema;
5+
import jakarta.persistence.Table;
6+
import lombok.Data;
7+
8+
@Data
9+
@Table(name = "approval_cc_task")
10+
public class ApprovalCcTask extends BaseModel {
11+
12+
@Schema(description = "抄送任务ID")
13+
private String taskId;
14+
15+
@Schema(description = "抄送人ID")
16+
private String ccUserId;
17+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package cn.cordys.crm.approval.domain;
2+
3+
import cn.cordys.common.domain.BaseModel;
4+
import io.swagger.v3.oas.annotations.media.Schema;
5+
import jakarta.persistence.Table;
6+
import lombok.Data;
7+
8+
@Data
9+
@Table(name = "approval_instance_attachment")
10+
public class ApprovalInstanceAttachment extends BaseModel {
11+
12+
@Schema(description = "审批实例ID")
13+
private String instanceId;
14+
15+
@Schema(description = "审批节点ID")
16+
private String approvalElementId;
17+
18+
@Schema(description = "附件ID")
19+
private String attachmentId;
20+
}

backend/crm/src/main/java/cn/cordys/crm/approval/domain/ApprovalReturnBackRecord.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
@Table(name = "approval_return_back_record")
1313
public class ApprovalReturnBackRecord extends BaseModel {
1414

15-
@Schema(description = "审批实例ID")
16-
private String instanceId;
17-
1815
@Schema(description = "当前任务ID")
1916
private String taskId;
2017

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package cn.cordys.crm.approval.dto;
2+
3+
import io.swagger.v3.oas.annotations.media.Schema;
4+
import lombok.Data;
5+
6+
@Data
7+
public class ApprovalCcNode {
8+
9+
@Schema(description = "抄送人ID")
10+
private String ccUserId;
11+
@Schema(description = "抄送人名称")
12+
private String ccUserName;
13+
@Schema(description = "抄送人头像")
14+
private String ccUserAvatar;
15+
}

backend/crm/src/main/java/cn/cordys/crm/approval/dto/ApprovalRecordNode.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.cordys.crm.approval.dto;
22

3+
import cn.cordys.crm.system.domain.Attachment;
34
import io.swagger.v3.oas.annotations.media.Schema;
45
import lombok.AllArgsConstructor;
56
import lombok.Builder;
@@ -35,9 +36,18 @@ public class ApprovalRecordNode {
3536
@Schema(description = "提交审批时间")
3637
private Long approvalTime;
3738

39+
@Schema(description = "审批意见")
40+
private String comment;
41+
42+
@Schema(description = "审批附件")
43+
private List<Attachment> attachments;
44+
45+
@Schema(description = "是否退回节点")
46+
private boolean isReturnNode;
47+
3848
@Schema(description = "是否加签节点")
3949
private boolean isAddSignNode;
4050

41-
@Schema(description = "抄送的节点列表")
42-
private List<ApprovalRecordNode> ccNodes;
51+
@Schema(description = "抄送的节点集合")
52+
private List<ApprovalCcNode> ccNodes;
4353
}

0 commit comments

Comments
 (0)