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
3f0bd8b1
Commit
3f0bd8b1
authored
Jul 04, 2022
by
284718418@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并 审批汇总新增加急字段
parent
35cbe3c8
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
+3
-0
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+2
-1
src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java
+3
-0
src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml
+2
-1
No files found.
src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
View file @
3f0bd8b1
...
@@ -97,6 +97,9 @@ public class SpmkApproveSummary extends Model<SpmkApproveSummary> {
...
@@ -97,6 +97,9 @@ public class SpmkApproveSummary extends Model<SpmkApproveSummary> {
@ApiModelProperty
(
value
=
"部门名称"
,
example
=
"部门名称"
)
@ApiModelProperty
(
value
=
"部门名称"
,
example
=
"部门名称"
)
private
String
bmName
;
private
String
bmName
;
@ApiModelProperty
(
value
=
"是否加急"
,
example
=
"0-否 1-是"
)
private
Integer
isUrgent
;
...
...
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
View file @
3f0bd8b1
...
@@ -652,7 +652,8 @@ public class SpmkController {
...
@@ -652,7 +652,8 @@ public class SpmkController {
.
approveName
(
spmkApproveSummaryDto
.
getApproveName
())
.
approveName
(
spmkApproveSummaryDto
.
getApproveName
())
.
assoType
(
spmkApproveSummaryDto
.
getAssoType
())
.
assoType
(
spmkApproveSummaryDto
.
getAssoType
())
.
sts
(
ApproveSummarySts
.
IN
.
ordinal
())
.
sts
(
ApproveSummarySts
.
IN
.
ordinal
())
.
currentApprover
(
currentApprover
).
build
();
.
currentApprover
(
currentApprover
).
isUrgent
(
spmkApproveSummaryDto
.
getIsUrgent
())
.
build
();
if
(!
as
.
insert
())
{
if
(!
as
.
insert
())
{
throw
new
CustomException
(
"审批汇总-新增异常"
);
throw
new
CustomException
(
"审批汇总-新增异常"
);
...
...
src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java
View file @
3f0bd8b1
...
@@ -57,4 +57,7 @@ public class SpmkApproveSummaryDto{
...
@@ -57,4 +57,7 @@ public class SpmkApproveSummaryDto{
@ApiModelProperty
(
value
=
"审批流程"
,
example
=
"审批流程"
,
required
=
true
)
@ApiModelProperty
(
value
=
"审批流程"
,
example
=
"审批流程"
,
required
=
true
)
private
Router
router
;
private
Router
router
;
@ApiModelProperty
(
value
=
"是否加急"
,
example
=
"是否加急"
,
required
=
true
)
private
Integer
isUrgent
;
}
}
src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml
View file @
3f0bd8b1
...
@@ -80,7 +80,8 @@
...
@@ -80,7 +80,8 @@
a.update_time,
a.update_time,
a.end_time,
a.end_time,
a.digest,
a.digest,
a.is_delete
a.is_delete,
a.is_urgent
</sql>
</sql>
<sql
id=
"Base_Column_List_Alias"
>
<sql
id=
"Base_Column_List_Alias"
>
...
...
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