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
ce1850d0
Commit
ce1850d0
authored
Dec 18, 2023
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(检验业务开通):更新按钮权限 & 数据权限
parent
c364e077
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
JyjcOpeningApplicationModel.java
...ot/module/jyjc/api/model/JyjcOpeningApplicationModel.java
+4
-2
JyjcOpeningApplicationServiceImpl.java
...c/biz/service/impl/JyjcOpeningApplicationServiceImpl.java
+3
-2
No files found.
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java
View file @
ce1850d0
...
...
@@ -48,10 +48,12 @@ public class JyjcOpeningApplicationModel extends BaseModel {
private
String
resultType
;
@ApiModelProperty
(
value
=
"有效期至"
)
private
String
expiryDate
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
expiryDate
;
@ApiModelProperty
(
value
=
"受理日期(接收日期)"
)
private
String
acceptDate
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
acceptDate
;
@ApiModelProperty
(
value
=
"状态"
)
private
String
status
;
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java
View file @
ce1850d0
...
...
@@ -95,6 +95,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
private
TzsUserInfoMapper
userInfoMapper
;
@Autowired
private
WorkflowHelper
workflowHelper
;
@Autowired
private
WorkflowFeignClient
workflowFeignClient
;
@Transactional
(
rollbackFor
=
{
Exception
.
class
,
BaseException
.
class
})
...
...
@@ -329,8 +331,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
return
((
Map
)
ajaxResult
.
get
(
"data"
)).
get
(
"id"
).
toString
();
}
@Autowired
private
WorkflowHelper
workflowHelper
;
/**
* 接收/驳回通知检验单
...
...
@@ -375,6 +375,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
if
(
"流程结束"
.
equals
(
taskName
))
{
status
=
FlowStatusEnum
.
TO_BE_FINISHED
.
getCode
()
+
""
;
}
else
{
// 如果是回退, 则业务状态改为未提交
status
=
"1"
.
equals
(
op
)
?
FlowStatusEnum
.
TO_BE_SUBMITTED
.
getCode
()
+
""
:
FlowStatusEnum
.
SUBMITTED
.
getCode
()
+
""
;
}
String
role
=
(
String
)
nextNodeInfo
.
get
(
"role"
);
...
...
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