소스 검색

格式化代码

chenshudong 4 달 전
부모
커밋
9b957e0a13

+ 42 - 43
airport-system/src/main/java/com/sundot/airport/system/domain/approval/ApprovalCc.java

@@ -16,130 +16,129 @@ import com.sundot.airport.common.core.domain.BaseEntity;
16 16
 
17 17
 /**
18 18
  * 审批抄送对象 approval_cc
19
- * 
19
+ *
20 20
  * @author simon lin
21 21
  * @date 2025-09-06
22 22
  */
23 23
 @TableName("approval_cc")
24
-public class ApprovalCc extends BaseEntity
25
-{
24
+public class ApprovalCc extends BaseEntity {
26 25
     private static final long serialVersionUID = 1L;
27 26
 
28
-    /** 主键ID */
27
+    /**
28
+     * 主键ID
29
+     */
29 30
     @TableId(type = IdType.AUTO)
30 31
     private Long id;
31 32
 
32
-    /** 实例ID */
33
+    /**
34
+     * 实例ID
35
+     */
33 36
     @Excel(name = "实例ID")
34 37
     @NotNull(message = "实例ID不能为空")
35 38
     private Long instanceId;
36 39
 
37
-    /** 抄送用户ID */
40
+    /**
41
+     * 抄送用户ID
42
+     */
38 43
     @Excel(name = "抄送用户ID")
39 44
     @NotNull(message = "抄送用户ID不能为空")
40 45
     private Long ccUserId;
41 46
 
42
-    /** 抄送用户姓名 */
47
+    /**
48
+     * 抄送用户姓名
49
+     */
43 50
     @Excel(name = "抄送用户姓名")
44 51
     @NotBlank(message = "抄送用户姓名不能为空")
45 52
     @Size(min = 0, max = 50, message = "抄送用户姓名长度不能超过50个字符")
46 53
     private String ccUserName;
47 54
 
48
-    /** 抄送时间 */
55
+    /**
56
+     * 抄送时间
57
+     */
49 58
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
50 59
     @Excel(name = "抄送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
51 60
     private Date ccTime;
52 61
 
53
-    /** 是否已读(0否 1是) */
62
+    /**
63
+     * 是否已读(0否 1是)
64
+     */
54 65
     @Excel(name = "是否已读", readConverterExp = "0=否,1=是")
55 66
     private String isRead;
56 67
 
57
-    /** 阅读时间 */
68
+    /**
69
+     * 阅读时间
70
+     */
58 71
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
59 72
     @Excel(name = "阅读时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
60 73
     private Date readTime;
61 74
 
62
-    /** 审批实例 */
75
+    /**
76
+     * 审批实例
77
+     */
63 78
     @TableField(exist = false)
64 79
     private ApprovalInstance instance;
65 80
 
66
-    public void setId(Long id) 
67
-    {
81
+    public void setId(Long id) {
68 82
         this.id = id;
69 83
     }
70 84
 
71
-    public Long getId() 
72
-    {
85
+    public Long getId() {
73 86
         return id;
74 87
     }
75 88
 
76
-    public void setInstanceId(Long instanceId) 
77
-    {
89
+    public void setInstanceId(Long instanceId) {
78 90
         this.instanceId = instanceId;
79 91
     }
80 92
 
81
-    public Long getInstanceId() 
82
-    {
93
+    public Long getInstanceId() {
83 94
         return instanceId;
84 95
     }
85 96
 
86
-    public void setCcUserId(Long ccUserId) 
87
-    {
97
+    public void setCcUserId(Long ccUserId) {
88 98
         this.ccUserId = ccUserId;
89 99
     }
90 100
 
91
-    public Long getCcUserId() 
92
-    {
101
+    public Long getCcUserId() {
93 102
         return ccUserId;
94 103
     }
95 104
 
96
-    public void setCcUserName(String ccUserName) 
97
-    {
105
+    public void setCcUserName(String ccUserName) {
98 106
         this.ccUserName = ccUserName;
99 107
     }
100 108
 
101
-    public String getCcUserName() 
102
-    {
109
+    public String getCcUserName() {
103 110
         return ccUserName;
104 111
     }
105 112
 
106
-    public void setCcTime(Date ccTime) 
107
-    {
113
+    public void setCcTime(Date ccTime) {
108 114
         this.ccTime = ccTime;
109 115
     }
110 116
 
111
-    public Date getCcTime() 
112
-    {
117
+    public Date getCcTime() {
113 118
         return ccTime;
114 119
     }
115 120
 
116
-    public void setIsRead(String isRead) 
117
-    {
121
+    public void setIsRead(String isRead) {
118 122
         this.isRead = isRead;
119 123
     }
120 124
 
121
-    public String getIsRead() 
122
-    {
125
+    public String getIsRead() {
123 126
         return isRead;
124 127
     }
125 128
 
126
-    public void setReadTime(Date readTime) 
127
-    {
129
+    public void setReadTime(Date readTime) {
128 130
         this.readTime = readTime;
129 131
     }
130 132
 
131
-    public Date getReadTime() 
132
-    {
133
+    public Date getReadTime() {
133 134
         return readTime;
134 135
     }
135 136
 
136
-    public ApprovalInstance getInstance() 
137
-    {
137
+    public ApprovalInstance getInstance() {
138 138
         return instance;
139 139
     }
140 140
 
141
-    public void setInstance(ApprovalInstance instance) 
142
-    {
141
+    public void setInstance(ApprovalInstance instance) {
143 142
         this.instance = instance;
144 143
     }
145 144
 

+ 67 - 68
airport-system/src/main/java/com/sundot/airport/system/domain/approval/ApprovalHistory.java

@@ -16,202 +16,201 @@ import com.sundot.airport.common.core.domain.BaseEntity;
16 16
 
17 17
 /**
18 18
  * 审批历史对象 approval_history
19
- * 
19
+ *
20 20
  * @author simon lin
21 21
  * @date 2025-09-06
22 22
  */
23 23
 @TableName("approval_history")
24
-public class ApprovalHistory extends BaseEntity
25
-{
24
+public class ApprovalHistory extends BaseEntity {
26 25
     private static final long serialVersionUID = 1L;
27 26
 
28
-    /** 主键ID */
27
+    /**
28
+     * 主键ID
29
+     */
29 30
     @TableId(type = IdType.AUTO)
30 31
     private Long id;
31 32
 
32
-    /** 实例ID */
33
+    /**
34
+     * 实例ID
35
+     */
33 36
     @Excel(name = "实例ID")
34 37
     @NotNull(message = "实例ID不能为空")
35 38
     private Long instanceId;
36 39
 
37
-    /** 任务ID */
40
+    /**
41
+     * 任务ID
42
+     */
38 43
     @Excel(name = "任务ID")
39 44
     private Long taskId;
40 45
 
41
-    /** 节点ID */
46
+    /**
47
+     * 节点ID
48
+     */
42 49
     @Excel(name = "节点ID")
43 50
     private Long nodeId;
44 51
 
45
-    /** 节点名称 */
52
+    /**
53
+     * 节点名称
54
+     */
46 55
     @Excel(name = "节点名称")
47 56
     @Size(min = 0, max = 100, message = "节点名称长度不能超过100个字符")
48 57
     private String nodeName;
49 58
 
50
-    /** 操作(SUBMIT:提交,APPROVE:同意,REJECT:驳回,CANCEL:取消,COMPLETE:完成) */
59
+    /**
60
+     * 操作(SUBMIT:提交,APPROVE:同意,REJECT:驳回,CANCEL:取消,COMPLETE:完成)
61
+     */
51 62
     @Excel(name = "操作")
52 63
     @NotBlank(message = "操作不能为空")
53 64
     @Size(min = 0, max = 50, message = "操作长度不能超过50个字符")
54 65
     private String action;
55 66
 
56
-    /** 操作人ID */
67
+    /**
68
+     * 操作人ID
69
+     */
57 70
     @Excel(name = "操作人ID")
58 71
     @NotNull(message = "操作人ID不能为空")
59 72
     private Long operatorId;
60 73
 
61
-    /** 操作人姓名 */
74
+    /**
75
+     * 操作人姓名
76
+     */
62 77
     @Excel(name = "操作人姓名")
63 78
     @NotBlank(message = "操作人姓名不能为空")
64 79
     @Size(min = 0, max = 50, message = "操作人姓名长度不能超过50个字符")
65 80
     private String operatorName;
66 81
 
67
-    /** 操作时间 */
82
+    /**
83
+     * 操作时间
84
+     */
68 85
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
69 86
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
70 87
     private Date operationTime;
71 88
 
72
-    /** 操作意见 */
89
+    /**
90
+     * 操作意见
91
+     */
73 92
     @Excel(name = "操作意见")
74 93
     private String comment;
75 94
 
76
-    /** 表单数据 */
95
+    /**
96
+     * 表单数据
97
+     */
77 98
     @Excel(name = "表单数据")
78 99
     private String formData;
79 100
 
80
-    /** 审批实例 */
101
+    /**
102
+     * 审批实例
103
+     */
81 104
     @TableField(exist = false)
82 105
     private ApprovalInstance instance;
83 106
 
84
-    /** 节点定义 */
107
+    /**
108
+     * 节点定义
109
+     */
85 110
     @TableField(exist = false)
86 111
     private ApprovalNodeDefinition nodeDefinition;
87 112
 
88
-    public void setId(Long id) 
89
-    {
113
+    public void setId(Long id) {
90 114
         this.id = id;
91 115
     }
92 116
 
93
-    public Long getId() 
94
-    {
117
+    public Long getId() {
95 118
         return id;
96 119
     }
97 120
 
98
-    public void setInstanceId(Long instanceId) 
99
-    {
121
+    public void setInstanceId(Long instanceId) {
100 122
         this.instanceId = instanceId;
101 123
     }
102 124
 
103
-    public Long getInstanceId() 
104
-    {
125
+    public Long getInstanceId() {
105 126
         return instanceId;
106 127
     }
107 128
 
108
-    public void setTaskId(Long taskId) 
109
-    {
129
+    public void setTaskId(Long taskId) {
110 130
         this.taskId = taskId;
111 131
     }
112 132
 
113
-    public Long getTaskId() 
114
-    {
133
+    public Long getTaskId() {
115 134
         return taskId;
116 135
     }
117 136
 
118
-    public void setNodeId(Long nodeId) 
119
-    {
137
+    public void setNodeId(Long nodeId) {
120 138
         this.nodeId = nodeId;
121 139
     }
122 140
 
123
-    public Long getNodeId() 
124
-    {
141
+    public Long getNodeId() {
125 142
         return nodeId;
126 143
     }
127 144
 
128
-    public void setNodeName(String nodeName) 
129
-    {
145
+    public void setNodeName(String nodeName) {
130 146
         this.nodeName = nodeName;
131 147
     }
132 148
 
133
-    public String getNodeName() 
134
-    {
149
+    public String getNodeName() {
135 150
         return nodeName;
136 151
     }
137 152
 
138
-    public void setAction(String action) 
139
-    {
153
+    public void setAction(String action) {
140 154
         this.action = action;
141 155
     }
142 156
 
143
-    public String getAction() 
144
-    {
157
+    public String getAction() {
145 158
         return action;
146 159
     }
147 160
 
148
-    public void setOperatorId(Long operatorId) 
149
-    {
161
+    public void setOperatorId(Long operatorId) {
150 162
         this.operatorId = operatorId;
151 163
     }
152 164
 
153
-    public Long getOperatorId() 
154
-    {
165
+    public Long getOperatorId() {
155 166
         return operatorId;
156 167
     }
157 168
 
158
-    public void setOperatorName(String operatorName) 
159
-    {
169
+    public void setOperatorName(String operatorName) {
160 170
         this.operatorName = operatorName;
161 171
     }
162 172
 
163
-    public String getOperatorName() 
164
-    {
173
+    public String getOperatorName() {
165 174
         return operatorName;
166 175
     }
167 176
 
168
-    public void setOperationTime(Date operationTime) 
169
-    {
177
+    public void setOperationTime(Date operationTime) {
170 178
         this.operationTime = operationTime;
171 179
     }
172 180
 
173
-    public Date getOperationTime() 
174
-    {
181
+    public Date getOperationTime() {
175 182
         return operationTime;
176 183
     }
177 184
 
178
-    public void setComment(String comment) 
179
-    {
185
+    public void setComment(String comment) {
180 186
         this.comment = comment;
181 187
     }
182 188
 
183
-    public String getComment() 
184
-    {
189
+    public String getComment() {
185 190
         return comment;
186 191
     }
187 192
 
188
-    public void setFormData(String formData) 
189
-    {
193
+    public void setFormData(String formData) {
190 194
         this.formData = formData;
191 195
     }
192 196
 
193
-    public String getFormData() 
194
-    {
197
+    public String getFormData() {
195 198
         return formData;
196 199
     }
197 200
 
198
-    public ApprovalInstance getInstance() 
199
-    {
201
+    public ApprovalInstance getInstance() {
200 202
         return instance;
201 203
     }
202 204
 
203
-    public void setInstance(ApprovalInstance instance) 
204
-    {
205
+    public void setInstance(ApprovalInstance instance) {
205 206
         this.instance = instance;
206 207
     }
207 208
 
208
-    public ApprovalNodeDefinition getNodeDefinition() 
209
-    {
209
+    public ApprovalNodeDefinition getNodeDefinition() {
210 210
         return nodeDefinition;
211 211
     }
212 212
 
213
-    public void setNodeDefinition(ApprovalNodeDefinition nodeDefinition) 
214
-    {
213
+    public void setNodeDefinition(ApprovalNodeDefinition nodeDefinition) {
215 214
         this.nodeDefinition = nodeDefinition;
216 215
     }
217 216
 

+ 97 - 98
airport-system/src/main/java/com/sundot/airport/system/domain/approval/ApprovalInstance.java

@@ -17,293 +17,292 @@ import com.sundot.airport.common.core.domain.BaseEntity;
17 17
 
18 18
 /**
19 19
  * 审批实例对象 approval_instance
20
- * 
20
+ *
21 21
  * @author simon lin
22 22
  * @date 2025-09-06
23 23
  */
24 24
 @TableName("approval_instance")
25
-public class ApprovalInstance extends BaseEntity
26
-{
25
+public class ApprovalInstance extends BaseEntity {
27 26
     private static final long serialVersionUID = 1L;
28 27
 
29
-    /** 主键ID */
28
+    /**
29
+     * 主键ID
30
+     */
30 31
     @TableId(type = IdType.AUTO)
31 32
     private Long id;
32 33
 
33
-    /** 实例编号 */
34
+    /**
35
+     * 实例编号
36
+     */
34 37
     @Excel(name = "实例编号")
35 38
     @NotBlank(message = "实例编号不能为空")
36 39
     @Size(min = 0, max = 50, message = "实例编号长度不能超过50个字符")
37 40
     private String instanceNo;
38 41
 
39
-    /** 流程定义ID */
42
+    /**
43
+     * 流程定义ID
44
+     */
40 45
     @Excel(name = "流程定义ID")
41 46
     @NotNull(message = "流程定义ID不能为空")
42 47
     private Long workflowId;
43 48
 
44
-    /** 审批标题 */
49
+    /**
50
+     * 审批标题
51
+     */
45 52
     @Excel(name = "审批标题")
46 53
     @NotBlank(message = "审批标题不能为空")
47 54
     @Size(min = 0, max = 200, message = "审批标题长度不能超过200个字符")
48 55
     private String title;
49 56
 
50
-    /** 业务类型 */
57
+    /**
58
+     * 业务类型
59
+     */
51 60
     @Excel(name = "业务类型")
52 61
     @NotBlank(message = "业务类型不能为空")
53 62
     @Size(min = 0, max = 50, message = "业务类型长度不能超过50个字符")
54 63
     private String businessType;
55 64
 
56
-    /** 业务ID */
65
+    /**
66
+     * 业务ID
67
+     */
57 68
     @Excel(name = "业务ID")
58 69
     @NotNull(message = "业务ID不能为空")
59 70
     private Long businessId;
60 71
 
61
-    /** 业务数据(JSON格式) */
72
+    /**
73
+     * 业务数据(JSON格式)
74
+     */
62 75
     @Excel(name = "业务数据")
63 76
     private String businessData;
64 77
 
65
-    /** 提交人ID */
78
+    /**
79
+     * 提交人ID
80
+     */
66 81
     @Excel(name = "提交人ID")
67 82
     @NotNull(message = "提交人ID不能为空")
68 83
     private Long submitterId;
69 84
 
70
-    /** 提交人姓名 */
85
+    /**
86
+     * 提交人姓名
87
+     */
71 88
     @Excel(name = "提交人姓名")
72 89
     @NotBlank(message = "提交人姓名不能为空")
73 90
     @Size(min = 0, max = 50, message = "提交人姓名长度不能超过50个字符")
74 91
     private String submitterName;
75 92
 
76
-    /** 提交时间 */
93
+    /**
94
+     * 提交时间
95
+     */
77 96
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
78 97
     @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
79 98
     private Date submitTime;
80 99
 
81
-    /** 当前节点ID */
100
+    /**
101
+     * 当前节点ID
102
+     */
82 103
     @Excel(name = "当前节点ID")
83 104
     private Long currentNodeId;
84 105
 
85
-    /** 实例状态(RUNNING:运行中,COMPLETED:已完成,REJECTED:已驳回,CANCELLED:已取消) */
106
+    /**
107
+     * 实例状态(RUNNING:运行中,COMPLETED:已完成,REJECTED:已驳回,CANCELLED:已取消)
108
+     */
86 109
     @Excel(name = "实例状态")
87 110
     @Size(min = 0, max = 20, message = "实例状态长度不能超过20个字符")
88 111
     private String status;
89 112
 
90
-    /** 完成时间 */
113
+    /**
114
+     * 完成时间
115
+     */
91 116
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
92 117
     @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
93 118
     private Date completionTime;
94 119
 
95
-    /** 紧急程度(LOW:低,NORMAL:普通,HIGH:高,URGENT:紧急) */
120
+    /**
121
+     * 紧急程度(LOW:低,NORMAL:普通,HIGH:高,URGENT:紧急)
122
+     */
96 123
     @Excel(name = "紧急程度")
97 124
     @Size(min = 0, max = 20, message = "紧急程度长度不能超过20个字符")
98 125
     private String urgentLevel;
99 126
 
100
-    /** 表单数据 */
127
+    /**
128
+     * 表单数据
129
+     */
101 130
     @Excel(name = "表单数据")
102 131
     private String formData;
103 132
 
104
-    /** 任务列表 */
133
+    /**
134
+     * 任务列表
135
+     */
105 136
     @TableField(exist = false)
106 137
     private List<ApprovalTask> tasks;
107 138
 
108
-    /** 历史记录 */
139
+    /**
140
+     * 历史记录
141
+     */
109 142
     @TableField(exist = false)
110 143
     private List<ApprovalHistory> histories;
111 144
 
112
-    /** 流程定义 */
145
+    /**
146
+     * 流程定义
147
+     */
113 148
     @TableField(exist = false)
114 149
     private ApprovalWorkflowDefinition workflowDefinition;
115 150
 
116
-    /** 当前节点定义 */
151
+    /**
152
+     * 当前节点定义
153
+     */
117 154
     @TableField(exist = false)
118 155
     private ApprovalNodeDefinition currentNode;
119 156
 
120
-    public void setId(Long id) 
121
-    {
157
+    public void setId(Long id) {
122 158
         this.id = id;
123 159
     }
124 160
 
125
-    public Long getId() 
126
-    {
161
+    public Long getId() {
127 162
         return id;
128 163
     }
129 164
 
130
-    public void setInstanceNo(String instanceNo) 
131
-    {
165
+    public void setInstanceNo(String instanceNo) {
132 166
         this.instanceNo = instanceNo;
133 167
     }
134 168
 
135
-    public String getInstanceNo() 
136
-    {
169
+    public String getInstanceNo() {
137 170
         return instanceNo;
138 171
     }
139 172
 
140
-    public void setWorkflowId(Long workflowId) 
141
-    {
173
+    public void setWorkflowId(Long workflowId) {
142 174
         this.workflowId = workflowId;
143 175
     }
144 176
 
145
-    public Long getWorkflowId() 
146
-    {
177
+    public Long getWorkflowId() {
147 178
         return workflowId;
148 179
     }
149 180
 
150
-    public void setTitle(String title) 
151
-    {
181
+    public void setTitle(String title) {
152 182
         this.title = title;
153 183
     }
154 184
 
155
-    public String getTitle() 
156
-    {
185
+    public String getTitle() {
157 186
         return title;
158 187
     }
159 188
 
160
-    public void setBusinessType(String businessType) 
161
-    {
189
+    public void setBusinessType(String businessType) {
162 190
         this.businessType = businessType;
163 191
     }
164 192
 
165
-    public String getBusinessType() 
166
-    {
193
+    public String getBusinessType() {
167 194
         return businessType;
168 195
     }
169 196
 
170
-    public void setBusinessId(Long businessId) 
171
-    {
197
+    public void setBusinessId(Long businessId) {
172 198
         this.businessId = businessId;
173 199
     }
174 200
 
175
-    public Long getBusinessId() 
176
-    {
201
+    public Long getBusinessId() {
177 202
         return businessId;
178 203
     }
179 204
 
180
-    public void setBusinessData(String businessData) 
181
-    {
205
+    public void setBusinessData(String businessData) {
182 206
         this.businessData = businessData;
183 207
     }
184 208
 
185
-    public String getBusinessData() 
186
-    {
209
+    public String getBusinessData() {
187 210
         return businessData;
188 211
     }
189 212
 
190
-    public void setSubmitterId(Long submitterId) 
191
-    {
213
+    public void setSubmitterId(Long submitterId) {
192 214
         this.submitterId = submitterId;
193 215
     }
194 216
 
195
-    public Long getSubmitterId() 
196
-    {
217
+    public Long getSubmitterId() {
197 218
         return submitterId;
198 219
     }
199 220
 
200
-    public void setSubmitterName(String submitterName) 
201
-    {
221
+    public void setSubmitterName(String submitterName) {
202 222
         this.submitterName = submitterName;
203 223
     }
204 224
 
205
-    public String getSubmitterName() 
206
-    {
225
+    public String getSubmitterName() {
207 226
         return submitterName;
208 227
     }
209 228
 
210
-    public void setSubmitTime(Date submitTime) 
211
-    {
229
+    public void setSubmitTime(Date submitTime) {
212 230
         this.submitTime = submitTime;
213 231
     }
214 232
 
215
-    public Date getSubmitTime() 
216
-    {
233
+    public Date getSubmitTime() {
217 234
         return submitTime;
218 235
     }
219 236
 
220
-    public void setCurrentNodeId(Long currentNodeId) 
221
-    {
237
+    public void setCurrentNodeId(Long currentNodeId) {
222 238
         this.currentNodeId = currentNodeId;
223 239
     }
224 240
 
225
-    public Long getCurrentNodeId() 
226
-    {
241
+    public Long getCurrentNodeId() {
227 242
         return currentNodeId;
228 243
     }
229 244
 
230
-    public void setStatus(String status) 
231
-    {
245
+    public void setStatus(String status) {
232 246
         this.status = status;
233 247
     }
234 248
 
235
-    public String getStatus() 
236
-    {
249
+    public String getStatus() {
237 250
         return status;
238 251
     }
239 252
 
240
-    public void setCompletionTime(Date completionTime) 
241
-    {
253
+    public void setCompletionTime(Date completionTime) {
242 254
         this.completionTime = completionTime;
243 255
     }
244 256
 
245
-    public Date getCompletionTime() 
246
-    {
257
+    public Date getCompletionTime() {
247 258
         return completionTime;
248 259
     }
249 260
 
250
-    public void setUrgentLevel(String urgentLevel) 
251
-    {
261
+    public void setUrgentLevel(String urgentLevel) {
252 262
         this.urgentLevel = urgentLevel;
253 263
     }
254 264
 
255
-    public String getUrgentLevel() 
256
-    {
265
+    public String getUrgentLevel() {
257 266
         return urgentLevel;
258 267
     }
259 268
 
260
-    public void setFormData(String formData) 
261
-    {
269
+    public void setFormData(String formData) {
262 270
         this.formData = formData;
263 271
     }
264 272
 
265
-    public String getFormData() 
266
-    {
273
+    public String getFormData() {
267 274
         return formData;
268 275
     }
269 276
 
270
-    public List<ApprovalTask> getTasks() 
271
-    {
277
+    public List<ApprovalTask> getTasks() {
272 278
         return tasks;
273 279
     }
274 280
 
275
-    public void setTasks(List<ApprovalTask> tasks) 
276
-    {
281
+    public void setTasks(List<ApprovalTask> tasks) {
277 282
         this.tasks = tasks;
278 283
     }
279 284
 
280
-    public List<ApprovalHistory> getHistories() 
281
-    {
285
+    public List<ApprovalHistory> getHistories() {
282 286
         return histories;
283 287
     }
284 288
 
285
-    public void setHistories(List<ApprovalHistory> histories) 
286
-    {
289
+    public void setHistories(List<ApprovalHistory> histories) {
287 290
         this.histories = histories;
288 291
     }
289 292
 
290
-    public ApprovalWorkflowDefinition getWorkflowDefinition() 
291
-    {
293
+    public ApprovalWorkflowDefinition getWorkflowDefinition() {
292 294
         return workflowDefinition;
293 295
     }
294 296
 
295
-    public void setWorkflowDefinition(ApprovalWorkflowDefinition workflowDefinition) 
296
-    {
297
+    public void setWorkflowDefinition(ApprovalWorkflowDefinition workflowDefinition) {
297 298
         this.workflowDefinition = workflowDefinition;
298 299
     }
299 300
 
300
-    public ApprovalNodeDefinition getCurrentNode() 
301
-    {
301
+    public ApprovalNodeDefinition getCurrentNode() {
302 302
         return currentNode;
303 303
     }
304 304
 
305
-    public void setCurrentNode(ApprovalNodeDefinition currentNode) 
306
-    {
305
+    public void setCurrentNode(ApprovalNodeDefinition currentNode) {
307 306
         this.currentNode = currentNode;
308 307
     }
309 308
 

+ 62 - 63
airport-system/src/main/java/com/sundot/airport/system/domain/approval/ApprovalNodeDefinition.java

@@ -12,190 +12,189 @@ import com.sundot.airport.common.core.domain.BaseEntity;
12 12
 
13 13
 /**
14 14
  * 审批节点定义对象 approval_node_definition
15
- * 
15
+ *
16 16
  * @author simon lin
17 17
  * @date 2025-09-06
18 18
  */
19 19
 @TableName("approval_node_definition")
20
-public class ApprovalNodeDefinition extends BaseEntity
21
-{
20
+public class ApprovalNodeDefinition extends BaseEntity {
22 21
     private static final long serialVersionUID = 1L;
23 22
 
24
-    /** 主键ID */
23
+    /**
24
+     * 主键ID
25
+     */
25 26
     @TableId(type = IdType.AUTO)
26 27
     private Long id;
27 28
 
28
-    /** 流程定义ID */
29
+    /**
30
+     * 流程定义ID
31
+     */
29 32
     @Excel(name = "流程定义ID")
30 33
     @NotNull(message = "流程定义ID不能为空")
31 34
     private Long workflowId;
32 35
 
33
-    /** 节点代码 */
36
+    /**
37
+     * 节点代码
38
+     */
34 39
     @Excel(name = "节点代码")
35 40
     @NotBlank(message = "节点代码不能为空")
36 41
     @Size(min = 0, max = 50, message = "节点代码长度不能超过50个字符")
37 42
     private String nodeCode;
38 43
 
39
-    /** 节点名称 */
44
+    /**
45
+     * 节点名称
46
+     */
40 47
     @Excel(name = "节点名称")
41 48
     @NotBlank(message = "节点名称不能为空")
42 49
     @Size(min = 0, max = 100, message = "节点名称长度不能超过100个字符")
43 50
     private String nodeName;
44 51
 
45
-    /** 节点类型(START:开始,APPROVE:审批,NOTIFY:通知,END:结束) */
52
+    /**
53
+     * 节点类型(START:开始,APPROVE:审批,NOTIFY:通知,END:结束)
54
+     */
46 55
     @Excel(name = "节点类型")
47 56
     @NotBlank(message = "节点类型不能为空")
48 57
     @Size(min = 0, max = 50, message = "节点类型长度不能超过50个字符")
49 58
     private String nodeType;
50 59
 
51
-    /** 节点顺序 */
60
+    /**
61
+     * 节点顺序
62
+     */
52 63
     @Excel(name = "节点顺序")
53 64
     @NotNull(message = "节点顺序不能为空")
54 65
     private Integer sortOrder;
55 66
 
56
-    /** 审批人类型(USER:指定用户,ROLE:角色,DEPT:部门,GROUP_LEADER:班组长,SECTION_LEADER:科长) */
67
+    /**
68
+     * 审批人类型(USER:指定用户,ROLE:角色,DEPT:部门,GROUP_LEADER:班组长,SECTION_LEADER:科长)
69
+     */
57 70
     @Excel(name = "审批人类型")
58 71
     @Size(min = 0, max = 50, message = "审批人类型长度不能超过50个字符")
59 72
     private String approverType;
60 73
 
61
-    /** 审批人值 */
74
+    /**
75
+     * 审批人值
76
+     */
62 77
     @Excel(name = "审批人值")
63 78
     @Size(min = 0, max = 200, message = "审批人值长度不能超过200个字符")
64 79
     private String approverValue;
65 80
 
66
-    /** 是否可驳回(0否 1是) */
81
+    /**
82
+     * 是否可驳回(0否 1是)
83
+     */
67 84
     @Excel(name = "是否可驳回", readConverterExp = "0=否,1=是")
68 85
     private String canReject;
69 86
 
70
-    /** 是否必须审批(0否 1是) */
87
+    /**
88
+     * 是否必须审批(0否 1是)
89
+     */
71 90
     @Excel(name = "是否必须审批", readConverterExp = "0=否,1=是")
72 91
     private String isRequired;
73 92
 
74
-    /** 超时小时数 */
93
+    /**
94
+     * 超时小时数
95
+     */
75 96
     @Excel(name = "超时小时数")
76 97
     private Integer timeoutHours;
77 98
 
78
-    /** 状态(0正常 1停用) */
99
+    /**
100
+     * 状态(0正常 1停用)
101
+     */
79 102
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
80 103
     private String status;
81 104
 
82
-    public void setId(Long id) 
83
-    {
105
+    public void setId(Long id) {
84 106
         this.id = id;
85 107
     }
86 108
 
87
-    public Long getId() 
88
-    {
109
+    public Long getId() {
89 110
         return id;
90 111
     }
91 112
 
92
-    public void setWorkflowId(Long workflowId) 
93
-    {
113
+    public void setWorkflowId(Long workflowId) {
94 114
         this.workflowId = workflowId;
95 115
     }
96 116
 
97
-    public Long getWorkflowId() 
98
-    {
117
+    public Long getWorkflowId() {
99 118
         return workflowId;
100 119
     }
101 120
 
102
-    public void setNodeCode(String nodeCode) 
103
-    {
121
+    public void setNodeCode(String nodeCode) {
104 122
         this.nodeCode = nodeCode;
105 123
     }
106 124
 
107
-    public String getNodeCode() 
108
-    {
125
+    public String getNodeCode() {
109 126
         return nodeCode;
110 127
     }
111 128
 
112
-    public void setNodeName(String nodeName) 
113
-    {
129
+    public void setNodeName(String nodeName) {
114 130
         this.nodeName = nodeName;
115 131
     }
116 132
 
117
-    public String getNodeName() 
118
-    {
133
+    public String getNodeName() {
119 134
         return nodeName;
120 135
     }
121 136
 
122
-    public void setNodeType(String nodeType) 
123
-    {
137
+    public void setNodeType(String nodeType) {
124 138
         this.nodeType = nodeType;
125 139
     }
126 140
 
127
-    public String getNodeType() 
128
-    {
141
+    public String getNodeType() {
129 142
         return nodeType;
130 143
     }
131 144
 
132
-    public void setSortOrder(Integer sortOrder) 
133
-    {
145
+    public void setSortOrder(Integer sortOrder) {
134 146
         this.sortOrder = sortOrder;
135 147
     }
136 148
 
137
-    public Integer getSortOrder() 
138
-    {
149
+    public Integer getSortOrder() {
139 150
         return sortOrder;
140 151
     }
141 152
 
142
-    public void setApproverType(String approverType) 
143
-    {
153
+    public void setApproverType(String approverType) {
144 154
         this.approverType = approverType;
145 155
     }
146 156
 
147
-    public String getApproverType() 
148
-    {
157
+    public String getApproverType() {
149 158
         return approverType;
150 159
     }
151 160
 
152
-    public void setApproverValue(String approverValue) 
153
-    {
161
+    public void setApproverValue(String approverValue) {
154 162
         this.approverValue = approverValue;
155 163
     }
156 164
 
157
-    public String getApproverValue() 
158
-    {
165
+    public String getApproverValue() {
159 166
         return approverValue;
160 167
     }
161 168
 
162
-    public void setCanReject(String canReject) 
163
-    {
169
+    public void setCanReject(String canReject) {
164 170
         this.canReject = canReject;
165 171
     }
166 172
 
167
-    public String getCanReject() 
168
-    {
173
+    public String getCanReject() {
169 174
         return canReject;
170 175
     }
171 176
 
172
-    public void setIsRequired(String isRequired) 
173
-    {
177
+    public void setIsRequired(String isRequired) {
174 178
         this.isRequired = isRequired;
175 179
     }
176 180
 
177
-    public String getIsRequired() 
178
-    {
181
+    public String getIsRequired() {
179 182
         return isRequired;
180 183
     }
181 184
 
182
-    public void setTimeoutHours(Integer timeoutHours) 
183
-    {
185
+    public void setTimeoutHours(Integer timeoutHours) {
184 186
         this.timeoutHours = timeoutHours;
185 187
     }
186 188
 
187
-    public Integer getTimeoutHours() 
188
-    {
189
+    public Integer getTimeoutHours() {
189 190
         return timeoutHours;
190 191
     }
191 192
 
192
-    public void setStatus(String status) 
193
-    {
193
+    public void setStatus(String status) {
194 194
         this.status = status;
195 195
     }
196 196
 
197
-    public String getStatus() 
198
-    {
197
+    public String getStatus() {
199 198
         return status;
200 199
     }
201 200
 

+ 82 - 83
airport-system/src/main/java/com/sundot/airport/system/domain/approval/ApprovalTask.java

@@ -16,249 +16,248 @@ import com.sundot.airport.common.core.domain.BaseEntity;
16 16
 
17 17
 /**
18 18
  * 审批任务对象 approval_task
19
- * 
19
+ *
20 20
  * @author simon lin
21 21
  * @date 2025-09-06
22 22
  */
23 23
 @TableName("approval_task")
24
-public class ApprovalTask extends BaseEntity
25
-{
24
+public class ApprovalTask extends BaseEntity {
26 25
     private static final long serialVersionUID = 1L;
27 26
 
28
-    /** 主键ID */
27
+    /**
28
+     * 主键ID
29
+     */
29 30
     @TableId(type = IdType.AUTO)
30 31
     private Long id;
31 32
 
32
-    /** 任务编号 */
33
+    /**
34
+     * 任务编号
35
+     */
33 36
     @Excel(name = "任务编号")
34 37
     @NotBlank(message = "任务编号不能为空")
35 38
     @Size(min = 0, max = 50, message = "任务编号长度不能超过50个字符")
36 39
     private String taskNo;
37 40
 
38
-    /** 实例ID */
41
+    /**
42
+     * 实例ID
43
+     */
39 44
     @Excel(name = "实例ID")
40 45
     @NotNull(message = "实例ID不能为空")
41 46
     private Long instanceId;
42 47
 
43
-    /** 节点ID */
48
+    /**
49
+     * 节点ID
50
+     */
44 51
     @Excel(name = "节点ID")
45 52
     @NotNull(message = "节点ID不能为空")
46 53
     private Long nodeId;
47 54
 
48
-    /** 任务名称 */
55
+    /**
56
+     * 任务名称
57
+     */
49 58
     @Excel(name = "任务名称")
50 59
     @NotBlank(message = "任务名称不能为空")
51 60
     @Size(min = 0, max = 100, message = "任务名称长度不能超过100个字符")
52 61
     private String taskName;
53 62
 
54
-    /** 处理人ID */
63
+    /**
64
+     * 处理人ID
65
+     */
55 66
     @Excel(name = "处理人ID")
56 67
     @NotNull(message = "处理人ID不能为空")
57 68
     private Long assigneeId;
58 69
 
59
-    /** 处理人姓名 */
70
+    /**
71
+     * 处理人姓名
72
+     */
60 73
     @Excel(name = "处理人姓名")
61 74
     @NotBlank(message = "处理人姓名不能为空")
62 75
     @Size(min = 0, max = 50, message = "处理人姓名长度不能超过50个字符")
63 76
     private String assigneeName;
64 77
 
65
-    /** 分配时间 */
78
+    /**
79
+     * 分配时间
80
+     */
66 81
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
67 82
     @Excel(name = "分配时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
68 83
     private Date assignTime;
69 84
 
70
-    /** 任务状态(PENDING:待处理,APPROVED:已同意,REJECTED:已驳回,CANCELLED:已取消) */
85
+    /**
86
+     * 任务状态(PENDING:待处理,APPROVED:已同意,REJECTED:已驳回,CANCELLED:已取消)
87
+     */
71 88
     @Excel(name = "任务状态")
72 89
     @Size(min = 0, max = 20, message = "任务状态长度不能超过20个字符")
73 90
     private String status;
74 91
 
75
-    /** 完成时间 */
92
+    /**
93
+     * 完成时间
94
+     */
76 95
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
77 96
     @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
78 97
     private Date completeTime;
79 98
 
80
-    /** 审批意见 */
99
+    /**
100
+     * 审批意见
101
+     */
81 102
     @Excel(name = "审批意见")
82 103
     private String comment;
83 104
 
84
-    /** 表单数据 */
105
+    /**
106
+     * 表单数据
107
+     */
85 108
     @Excel(name = "表单数据")
86 109
     private String formData;
87 110
 
88
-    /** 超时时间 */
111
+    /**
112
+     * 超时时间
113
+     */
89 114
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
90 115
     @Excel(name = "超时时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
91 116
     private Date timeoutTime;
92 117
 
93
-    /** 是否超时(0否 1是) */
118
+    /**
119
+     * 是否超时(0否 1是)
120
+     */
94 121
     @Excel(name = "是否超时", readConverterExp = "0=否,1=是")
95 122
     private String isTimeout;
96 123
 
97
-    /** 审批实例 */
124
+    /**
125
+     * 审批实例
126
+     */
98 127
     @TableField(exist = false)
99 128
     private ApprovalInstance instance;
100 129
 
101
-    /** 节点定义 */
130
+    /**
131
+     * 节点定义
132
+     */
102 133
     @TableField(exist = false)
103 134
     private ApprovalNodeDefinition nodeDefinition;
104 135
 
105
-    public void setId(Long id) 
106
-    {
136
+    public void setId(Long id) {
107 137
         this.id = id;
108 138
     }
109 139
 
110
-    public Long getId() 
111
-    {
140
+    public Long getId() {
112 141
         return id;
113 142
     }
114 143
 
115
-    public void setTaskNo(String taskNo) 
116
-    {
144
+    public void setTaskNo(String taskNo) {
117 145
         this.taskNo = taskNo;
118 146
     }
119 147
 
120
-    public String getTaskNo() 
121
-    {
148
+    public String getTaskNo() {
122 149
         return taskNo;
123 150
     }
124 151
 
125
-    public void setInstanceId(Long instanceId) 
126
-    {
152
+    public void setInstanceId(Long instanceId) {
127 153
         this.instanceId = instanceId;
128 154
     }
129 155
 
130
-    public Long getInstanceId() 
131
-    {
156
+    public Long getInstanceId() {
132 157
         return instanceId;
133 158
     }
134 159
 
135
-    public void setNodeId(Long nodeId) 
136
-    {
160
+    public void setNodeId(Long nodeId) {
137 161
         this.nodeId = nodeId;
138 162
     }
139 163
 
140
-    public Long getNodeId() 
141
-    {
164
+    public Long getNodeId() {
142 165
         return nodeId;
143 166
     }
144 167
 
145
-    public void setTaskName(String taskName) 
146
-    {
168
+    public void setTaskName(String taskName) {
147 169
         this.taskName = taskName;
148 170
     }
149 171
 
150
-    public String getTaskName() 
151
-    {
172
+    public String getTaskName() {
152 173
         return taskName;
153 174
     }
154 175
 
155
-    public void setAssigneeId(Long assigneeId) 
156
-    {
176
+    public void setAssigneeId(Long assigneeId) {
157 177
         this.assigneeId = assigneeId;
158 178
     }
159 179
 
160
-    public Long getAssigneeId() 
161
-    {
180
+    public Long getAssigneeId() {
162 181
         return assigneeId;
163 182
     }
164 183
 
165
-    public void setAssigneeName(String assigneeName) 
166
-    {
184
+    public void setAssigneeName(String assigneeName) {
167 185
         this.assigneeName = assigneeName;
168 186
     }
169 187
 
170
-    public String getAssigneeName() 
171
-    {
188
+    public String getAssigneeName() {
172 189
         return assigneeName;
173 190
     }
174 191
 
175
-    public void setAssignTime(Date assignTime) 
176
-    {
192
+    public void setAssignTime(Date assignTime) {
177 193
         this.assignTime = assignTime;
178 194
     }
179 195
 
180
-    public Date getAssignTime() 
181
-    {
196
+    public Date getAssignTime() {
182 197
         return assignTime;
183 198
     }
184 199
 
185
-    public void setStatus(String status) 
186
-    {
200
+    public void setStatus(String status) {
187 201
         this.status = status;
188 202
     }
189 203
 
190
-    public String getStatus() 
191
-    {
204
+    public String getStatus() {
192 205
         return status;
193 206
     }
194 207
 
195
-    public void setCompleteTime(Date completeTime) 
196
-    {
208
+    public void setCompleteTime(Date completeTime) {
197 209
         this.completeTime = completeTime;
198 210
     }
199 211
 
200
-    public Date getCompleteTime() 
201
-    {
212
+    public Date getCompleteTime() {
202 213
         return completeTime;
203 214
     }
204 215
 
205
-    public void setComment(String comment) 
206
-    {
216
+    public void setComment(String comment) {
207 217
         this.comment = comment;
208 218
     }
209 219
 
210
-    public String getComment() 
211
-    {
220
+    public String getComment() {
212 221
         return comment;
213 222
     }
214 223
 
215
-    public void setFormData(String formData) 
216
-    {
224
+    public void setFormData(String formData) {
217 225
         this.formData = formData;
218 226
     }
219 227
 
220
-    public String getFormData() 
221
-    {
228
+    public String getFormData() {
222 229
         return formData;
223 230
     }
224 231
 
225
-    public void setTimeoutTime(Date timeoutTime) 
226
-    {
232
+    public void setTimeoutTime(Date timeoutTime) {
227 233
         this.timeoutTime = timeoutTime;
228 234
     }
229 235
 
230
-    public Date getTimeoutTime() 
231
-    {
236
+    public Date getTimeoutTime() {
232 237
         return timeoutTime;
233 238
     }
234 239
 
235
-    public void setIsTimeout(String isTimeout) 
236
-    {
240
+    public void setIsTimeout(String isTimeout) {
237 241
         this.isTimeout = isTimeout;
238 242
     }
239 243
 
240
-    public String getIsTimeout() 
241
-    {
244
+    public String getIsTimeout() {
242 245
         return isTimeout;
243 246
     }
244 247
 
245
-    public ApprovalInstance getInstance() 
246
-    {
248
+    public ApprovalInstance getInstance() {
247 249
         return instance;
248 250
     }
249 251
 
250
-    public void setInstance(ApprovalInstance instance) 
251
-    {
252
+    public void setInstance(ApprovalInstance instance) {
252 253
         this.instance = instance;
253 254
     }
254 255
 
255
-    public ApprovalNodeDefinition getNodeDefinition() 
256
-    {
256
+    public ApprovalNodeDefinition getNodeDefinition() {
257 257
         return nodeDefinition;
258 258
     }
259 259
 
260
-    public void setNodeDefinition(ApprovalNodeDefinition nodeDefinition) 
261
-    {
260
+    public void setNodeDefinition(ApprovalNodeDefinition nodeDefinition) {
262 261
         this.nodeDefinition = nodeDefinition;
263 262
     }
264 263
 

+ 37 - 38
airport-system/src/main/java/com/sundot/airport/system/domain/approval/ApprovalWorkflowDefinition.java

@@ -14,117 +14,116 @@ import com.sundot.airport.common.core.domain.BaseEntity;
14 14
 
15 15
 /**
16 16
  * 审批流程定义对象 approval_workflow_definition
17
- * 
17
+ *
18 18
  * @author simon lin
19 19
  * @date 2025-09-06
20 20
  */
21 21
 @TableName("approval_workflow_definition")
22
-public class ApprovalWorkflowDefinition extends BaseEntity
23
-{
22
+public class ApprovalWorkflowDefinition extends BaseEntity {
24 23
     private static final long serialVersionUID = 1L;
25 24
 
26
-    /** 主键ID */
25
+    /**
26
+     * 主键ID
27
+     */
27 28
     @TableId(type = IdType.AUTO)
28 29
     private Long id;
29 30
 
30
-    /** 流程代码 */
31
+    /**
32
+     * 流程代码
33
+     */
31 34
     @Excel(name = "流程代码")
32 35
     @NotBlank(message = "流程代码不能为空")
33 36
     @Size(min = 0, max = 50, message = "流程代码长度不能超过50个字符")
34 37
     private String workflowCode;
35 38
 
36
-    /** 流程名称 */
39
+    /**
40
+     * 流程名称
41
+     */
37 42
     @Excel(name = "流程名称")
38 43
     @NotBlank(message = "流程名称不能为空")
39 44
     @Size(min = 0, max = 100, message = "流程名称长度不能超过100个字符")
40 45
     private String workflowName;
41 46
 
42
-    /** 流程类型(PERSONAL:个人级别,SECTION:科级,GROUP:班组级,SEIZURE_REPORT:查获上报) */
47
+    /**
48
+     * 流程类型(PERSONAL:个人级别,SECTION:科级,GROUP:班组级,SEIZURE_REPORT:查获上报)
49
+     */
43 50
     @Excel(name = "流程类型")
44 51
     @NotBlank(message = "流程类型不能为空")
45 52
     @Size(min = 0, max = 50, message = "流程类型长度不能超过50个字符")
46 53
     private String workflowType;
47 54
 
48
-    /** 流程描述 */
55
+    /**
56
+     * 流程描述
57
+     */
49 58
     @Excel(name = "流程描述")
50 59
     @Size(min = 0, max = 500, message = "流程描述长度不能超过500个字符")
51 60
     private String description;
52 61
 
53
-    /** 状态(0正常 1停用) */
62
+    /**
63
+     * 状态(0正常 1停用)
64
+     */
54 65
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
55 66
     private String status;
56 67
 
57
-    /** 节点定义列表 */
68
+    /**
69
+     * 节点定义列表
70
+     */
58 71
     @TableField(exist = false)
59 72
     private List<ApprovalNodeDefinition> nodes;
60 73
 
61
-    public void setId(Long id) 
62
-    {
74
+    public void setId(Long id) {
63 75
         this.id = id;
64 76
     }
65 77
 
66
-    public Long getId() 
67
-    {
78
+    public Long getId() {
68 79
         return id;
69 80
     }
70 81
 
71
-    public void setWorkflowCode(String workflowCode) 
72
-    {
82
+    public void setWorkflowCode(String workflowCode) {
73 83
         this.workflowCode = workflowCode;
74 84
     }
75 85
 
76
-    public String getWorkflowCode() 
77
-    {
86
+    public String getWorkflowCode() {
78 87
         return workflowCode;
79 88
     }
80 89
 
81
-    public void setWorkflowName(String workflowName) 
82
-    {
90
+    public void setWorkflowName(String workflowName) {
83 91
         this.workflowName = workflowName;
84 92
     }
85 93
 
86
-    public String getWorkflowName() 
87
-    {
94
+    public String getWorkflowName() {
88 95
         return workflowName;
89 96
     }
90 97
 
91
-    public void setWorkflowType(String workflowType) 
92
-    {
98
+    public void setWorkflowType(String workflowType) {
93 99
         this.workflowType = workflowType;
94 100
     }
95 101
 
96
-    public String getWorkflowType() 
97
-    {
102
+    public String getWorkflowType() {
98 103
         return workflowType;
99 104
     }
100 105
 
101
-    public void setDescription(String description) 
102
-    {
106
+    public void setDescription(String description) {
103 107
         this.description = description;
104 108
     }
105 109
 
106
-    public String getDescription() 
107
-    {
110
+    public String getDescription() {
108 111
         return description;
109 112
     }
110 113
 
111
-    public void setStatus(String status) 
112
-    {
114
+    public void setStatus(String status) {
113 115
         this.status = status;
114 116
     }
115 117
 
116
-    public String getStatus() 
117
-    {
118
+    public String getStatus() {
118 119
         return status;
119 120
     }
120 121
 
121
-    public List<ApprovalNodeDefinition> getNodes() 
122
-    {
122
+    public List<ApprovalNodeDefinition> getNodes() {
123 123
         return nodes;
124 124
     }
125 125
 
126
-    public void setNodes(List<ApprovalNodeDefinition> nodes) 
127
-    {
126
+    public void setNodes(List<ApprovalNodeDefinition> nodes) {
128 127
         this.nodes = nodes;
129 128
     }
130 129
 

+ 169 - 86
airport-system/src/main/java/com/sundot/airport/system/domain/approval/constants/ApprovalConstants.java

@@ -2,135 +2,218 @@ package com.sundot.airport.system.domain.approval.constants;
2 2
 
3 3
 /**
4 4
  * 审批流程常量
5
- * 
5
+ *
6 6
  * @author simon lin
7 7
  * @date 2025-09-06
8 8
  */
9
-public class ApprovalConstants
10
-{
11
-    /** 流程状态 - 运行中 */
9
+public class ApprovalConstants {
10
+    /**
11
+     * 流程状态 - 运行中
12
+     */
12 13
     public static final String INSTANCE_STATUS_RUNNING = "RUNNING";
13
-    
14
-    /** 流程状态 - 已完成 */
14
+
15
+    /**
16
+     * 流程状态 - 已完成
17
+     */
15 18
     public static final String INSTANCE_STATUS_COMPLETED = "COMPLETED";
16
-    
17
-    /** 流程状态 - 已驳回 */
19
+
20
+    /**
21
+     * 流程状态 - 已驳回
22
+     */
18 23
     public static final String INSTANCE_STATUS_REJECTED = "REJECTED";
19
-    
20
-    /** 流程状态 - 已取消 */
24
+
25
+    /**
26
+     * 流程状态 - 已取消
27
+     */
21 28
     public static final String INSTANCE_STATUS_CANCELLED = "CANCELLED";
22
-    
23
-    /** 任务状态 - 待处理 */
29
+
30
+    /**
31
+     * 任务状态 - 待处理
32
+     */
24 33
     public static final String TASK_STATUS_PENDING = "PENDING";
25
-    
26
-    /** 任务状态 - 已同意 */
34
+
35
+    /**
36
+     * 任务状态 - 已同意
37
+     */
27 38
     public static final String TASK_STATUS_APPROVED = "APPROVED";
28
-    
29
-    /** 任务状态 - 已驳回 */
39
+
40
+    /**
41
+     * 任务状态 - 已驳回
42
+     */
30 43
     public static final String TASK_STATUS_REJECTED = "REJECTED";
31
-    
32
-    /** 任务状态 - 已取消 */
44
+
45
+    /**
46
+     * 任务状态 - 已取消
47
+     */
33 48
     public static final String TASK_STATUS_CANCELLED = "CANCELLED";
34
-    
35
-    /** 节点类型 - 开始 */
49
+
50
+    /**
51
+     * 节点类型 - 开始
52
+     */
36 53
     public static final String NODE_TYPE_START = "START";
37
-    
38
-    /** 节点类型 - 审批 */
54
+
55
+    /**
56
+     * 节点类型 - 审批
57
+     */
39 58
     public static final String NODE_TYPE_APPROVE = "APPROVE";
40
-    
41
-    /** 节点类型 - 通知 */
59
+
60
+    /**
61
+     * 节点类型 - 通知
62
+     */
42 63
     public static final String NODE_TYPE_NOTIFY = "NOTIFY";
43
-    
44
-    /** 节点类型 - 结束 */
64
+
65
+    /**
66
+     * 节点类型 - 结束
67
+     */
45 68
     public static final String NODE_TYPE_END = "END";
46
-    
47
-    /** 审批人类型 - 指定用户 */
69
+
70
+    /**
71
+     * 审批人类型 - 指定用户
72
+     */
48 73
     public static final String APPROVER_TYPE_USER = "USER";
49
-    
50
-    /** 审批人类型 - 角色 */
74
+
75
+    /**
76
+     * 审批人类型 - 角色
77
+     */
51 78
     public static final String APPROVER_TYPE_ROLE = "ROLE";
52
-    
53
-    /** 审批人类型 - 部门 */
79
+
80
+    /**
81
+     * 审批人类型 - 部门
82
+     */
54 83
     public static final String APPROVER_TYPE_DEPT = "DEPT";
55
-    
56
-    /** 审批人类型 - 班组长 */
84
+
85
+    /**
86
+     * 审批人类型 - 班组长
87
+     */
57 88
     public static final String APPROVER_TYPE_GROUP_LEADER = "GROUP_LEADER";
58
-    
59
-    /** 审批人类型 - 科长 */
89
+
90
+    /**
91
+     * 审批人类型 - 科长
92
+     */
60 93
     public static final String APPROVER_TYPE_SECTION_LEADER = "SECTION_LEADER";
61
-    
62
-    /** 操作类型 - 提交 */
94
+
95
+    /**
96
+     * 操作类型 - 提交
97
+     */
63 98
     public static final String ACTION_SUBMIT = "SUBMIT";
64
-    
65
-    /** 操作类型 - 同意 */
99
+
100
+    /**
101
+     * 操作类型 - 同意
102
+     */
66 103
     public static final String ACTION_APPROVE = "APPROVE";
67
-    
68
-    /** 操作类型 - 驳回 */
104
+
105
+    /**
106
+     * 操作类型 - 驳回
107
+     */
69 108
     public static final String ACTION_REJECT = "REJECT";
70
-    
71
-    /** 操作类型 - 取消 */
109
+
110
+    /**
111
+     * 操作类型 - 取消
112
+     */
72 113
     public static final String ACTION_CANCEL = "CANCEL";
73
-    
74
-    /** 操作类型 - 完成 */
114
+
115
+    /**
116
+     * 操作类型 - 完成
117
+     */
75 118
     public static final String ACTION_COMPLETE = "COMPLETE";
76
-    
77
-    /** 流程类型 - 个人级别 */
119
+
120
+    /**
121
+     * 流程类型 - 个人级别
122
+     */
78 123
     public static final String WORKFLOW_TYPE_PERSONAL = "PERSONAL";
79
-    
80
-    /** 流程类型 - 科级 */
124
+
125
+    /**
126
+     * 流程类型 - 科级
127
+     */
81 128
     public static final String WORKFLOW_TYPE_SECTION = "SECTION";
82
-    
83
-    /** 流程类型 - 班组级 */
129
+
130
+    /**
131
+     * 流程类型 - 班组级
132
+     */
84 133
     public static final String WORKFLOW_TYPE_GROUP = "GROUP";
85
-    
86
-    /** 流程类型 - 查获上报 */
134
+
135
+    /**
136
+     * 流程类型 - 查获上报
137
+     */
87 138
     public static final String WORKFLOW_TYPE_SEIZURE_REPORT = "SEIZURE_REPORT";
88
-    
89
-    /** 流程代码 - 个人级别 */
139
+
140
+    /**
141
+     * 流程代码 - 个人级别
142
+     */
90 143
     public static final String WORKFLOW_CODE_PERSONAL_LEVEL = "PERSONAL_LEVEL";
91
-    
92
-    /** 流程代码 - 科级 */
144
+
145
+    /**
146
+     * 流程代码 - 科级
147
+     */
93 148
     public static final String WORKFLOW_CODE_SECTION_LEVEL = "SECTION_LEVEL";
94
-    
95
-    /** 流程代码 - 班组级 */
149
+
150
+    /**
151
+     * 流程代码 - 班组级
152
+     */
96 153
     public static final String WORKFLOW_CODE_GROUP_LEVEL = "GROUP_LEVEL";
97
-    
98
-    /** 流程代码 - 查获上报(安检员) */
154
+
155
+    /**
156
+     * 流程代码 - 查获上报(安检员)
157
+     */
99 158
     public static final String WORKFLOW_CODE_SEIZURE_REPORT_STAFF = "SEIZURE_REPORT_STAFF";
100
-    
101
-    /** 流程代码 - 查获上报(班组长) */
159
+
160
+    /**
161
+     * 流程代码 - 查获上报(班组长)
162
+     */
102 163
     public static final String WORKFLOW_CODE_SEIZURE_REPORT_LEADER = "SEIZURE_REPORT_LEADER";
103
-    
104
-    /** 紧急程度 - 低 */
164
+
165
+    /**
166
+     * 紧急程度 - 低
167
+     */
105 168
     public static final String URGENT_LEVEL_LOW = "LOW";
106
-    
107
-    /** 紧急程度 - 普通 */
169
+
170
+    /**
171
+     * 紧急程度 - 普通
172
+     */
108 173
     public static final String URGENT_LEVEL_NORMAL = "NORMAL";
109
-    
110
-    /** 紧急程度 - 高 */
174
+
175
+    /**
176
+     * 紧急程度 - 高
177
+     */
111 178
     public static final String URGENT_LEVEL_HIGH = "HIGH";
112
-    
113
-    /** 紧急程度 - 紧急 */
179
+
180
+    /**
181
+     * 紧急程度 - 紧急
182
+     */
114 183
     public static final String URGENT_LEVEL_URGENT = "URGENT";
115
-    
116
-    /** 角色 - 班组长 */
184
+
185
+    /**
186
+     * 角色 - 班组长
187
+     */
117 188
     public static final String ROLE_GROUP_LEADER = "group_leader";
118
-    
119
-    /** 角色 - 科长 */
189
+
190
+    /**
191
+     * 角色 - 科长
192
+     */
120 193
     public static final String ROLE_SECTION_LEADER = "section_leader";
121
-    
122
-    /** 角色 - 质检员 */
194
+
195
+    /**
196
+     * 角色 - 质检员
197
+     */
123 198
     public static final String ROLE_QUALITY_INSPECTOR = "quality_inspector";
124
-    
125
-    /** 状态 - 正常 */
199
+
200
+    /**
201
+     * 状态 - 正常
202
+     */
126 203
     public static final String STATUS_NORMAL = "0";
127
-    
128
-    /** 状态 - 停用 */
204
+
205
+    /**
206
+     * 状态 - 停用
207
+     */
129 208
     public static final String STATUS_DISABLE = "1";
130
-    
131
-    /** 删除标志 - 存在 */
209
+
210
+    /**
211
+     * 删除标志 - 存在
212
+     */
132 213
     public static final String DEL_FLAG_NORMAL = "0";
133
-    
134
-    /** 删除标志 - 删除 */
214
+
215
+    /**
216
+     * 删除标志 - 删除
217
+     */
135 218
     public static final String DEL_FLAG_DELETE = "2";
136 219
 }

+ 65 - 35
airport-system/src/main/java/com/sundot/airport/system/domain/approval/dto/ApprovalCcDetailDTO.java

@@ -7,62 +7,92 @@ import com.fasterxml.jackson.annotation.JsonFormat;
7 7
 
8 8
 /**
9 9
  * 审批抄送详情DTO
10
- * 
10
+ *
11 11
  * @author simon lin
12 12
  * @date 2025-09-11
13 13
  */
14
-public class ApprovalCcDetailDTO
15
-{
16
-    /** 抄送ID */
14
+public class ApprovalCcDetailDTO {
15
+    /**
16
+     * 抄送ID
17
+     */
17 18
     private Long ccId;
18
-    
19
-    /** 实例ID */
19
+
20
+    /**
21
+     * 实例ID
22
+     */
20 23
     private Long instanceId;
21
-    
22
-    /** 抄送时间 */
24
+
25
+    /**
26
+     * 抄送时间
27
+     */
23 28
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
24 29
     private Date ccTime;
25
-    
26
-    /** 是否已读 */
30
+
31
+    /**
32
+     * 是否已读
33
+     */
27 34
     private String isRead;
28
-    
29
-    /** 阅读时间 */
35
+
36
+    /**
37
+     * 阅读时间
38
+     */
30 39
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
31 40
     private Date readTime;
32
-    
33
-    /** 审批实例标题 */
41
+
42
+    /**
43
+     * 审批实例标题
44
+     */
34 45
     private String title;
35
-    
36
-    /** 完成时间 */
46
+
47
+    /**
48
+     * 完成时间
49
+     */
37 50
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
38 51
     private Date completionTime;
39
-    
40
-    /** 业务ID */
52
+
53
+    /**
54
+     * 业务ID
55
+     */
41 56
     private Long businessId;
42
-    
43
-    /** 业务类型 */
57
+
58
+    /**
59
+     * 业务类型
60
+     */
44 61
     private String businessType;
45
-    
46
-    /** 历史记录列表 */
62
+
63
+    /**
64
+     * 历史记录列表
65
+     */
47 66
     private List<ApprovalHistoryDetailDTO> historyList;
48
-    
49
-    /** 表单数据 */
67
+
68
+    /**
69
+     * 表单数据
70
+     */
50 71
     private String formData;
51
-    
52
-    /** 历史记录详情内部类 */
53
-    public static class ApprovalHistoryDetailDTO
54
-    {
55
-        /** 节点名称 */
72
+
73
+    /**
74
+     * 历史记录详情内部类
75
+     */
76
+    public static class ApprovalHistoryDetailDTO {
77
+        /**
78
+         * 节点名称
79
+         */
56 80
         private String nodeName;
57
-        
58
-        /** 操作人姓名 */
81
+
82
+        /**
83
+         * 操作人姓名
84
+         */
59 85
         private String operatorName;
60
-        
61
-        /** 操作时间 */
86
+
87
+        /**
88
+         * 操作时间
89
+         */
62 90
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
63 91
         private Date operationTime;
64
-        
65
-        /** 操作意见 */
92
+
93
+        /**
94
+         * 操作意见
95
+         */
66 96
         private String comment;
67 97
 
68 98
         public String getNodeName() {