Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
0b9f1226
Commit
0b9f1226
authored
Jul 27, 2020
by
ilal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
f3e6908b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
+1
-1
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+3
-1
No files found.
src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
View file @
0b9f1226
...
...
@@ -65,7 +65,7 @@ public class SpmkApproveSummary extends Model<SpmkApproveSummary> {
private
String
approveName
;
@TableField
(
fill
=
FieldFill
.
INSERT
)
@ApiModelProperty
(
value
=
"状态 0审批中 1审批撤销 2审批通过/审批完成 3审批拒绝"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"状态 0审批中 1审批撤销 2审批通过/审批完成 3审批拒绝
4:已审批 5:全部
"
,
example
=
"101"
)
private
Integer
sts
;
@ApiModelProperty
(
value
=
"当前审批人 "
,
example
=
"当前审批人"
)
...
...
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
0b9f1226
package
cn
.
timer
.
api
.
controller
.
spmk
;
import
java.text.DateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
...
...
@@ -378,6 +379,7 @@ public class SpmkController {
ca
.
setOrgCode
(
userBean
.
getOrgCode
());
ca
.
setFroms
(
ObjectUtil
.
serialize
(
spmkCustomApprovalDto
.
getFroms
()));
ca
.
setRouter
(
ObjectUtil
.
serialize
(
spmkCustomApprovalDto
.
getRouter
()));
ca
.
setUpdateTime
(
new
Date
());
//1.新增 SpmkCustomApproval-自定义审批
if
(!
ca
.
insertOrUpdate
())
...
...
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