Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
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
liqin
chnmuseum-party
Commits
eb0c46a1
Commit
eb0c46a1
authored
May 12, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
964d9385
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
Audit.java
src/main/java/cn/chnmuseum/party/model/Audit.java
+2
-2
AuditController.java
...va/cn/chnmuseum/party/web/controller/AuditController.java
+3
-2
No files found.
src/main/java/cn/chnmuseum/party/model/Audit.java
View file @
eb0c46a1
...
...
@@ -99,7 +99,7 @@ public class Audit implements Serializable {
@TableField
(
"model_data"
)
private
String
modelData
;
@ApiModelProperty
(
"
审核
人员"
)
@ApiModelProperty
(
"
初审
人员"
)
@TableField
(
value
=
"audit_id"
)
private
String
auditId
;
...
...
@@ -115,7 +115,7 @@ public class Audit implements Serializable {
@TableField
(
exist
=
false
)
private
String
name
;
@ApiModelProperty
(
"
审核
人名"
)
@ApiModelProperty
(
"
初审
人名"
)
@TableField
(
exist
=
false
)
private
String
auditName
;
...
...
src/main/java/cn/chnmuseum/party/web/controller/AuditController.java
View file @
eb0c46a1
...
...
@@ -117,7 +117,6 @@ public class AuditController extends BaseController {
@MethodLog
(
operModule
=
OperModule
.
RECHECK
,
operType
=
OperType
.
AUDIT
)
public
Map
<
String
,
Object
>
updateAudit
(
@RequestBody
@Validated
(
value
=
{
Update
.
class
})
Audit
audit
)
{
TUser
tUser
=
getcurUser
();
audit
.
setAuditId
(
tUser
.
getId
());
boolean
flag
;
//如果层级是初审,设置初审时间
if
(
AuditStatusEnum
.
TBC
.
name
().
equals
(
audit
.
getLevel
()))
{
...
...
@@ -126,6 +125,7 @@ public class AuditController extends BaseController {
if
(!
AuditStatusEnum
.
REFUSED
.
name
().
equals
(
audit
.
getStatus
()))
{
audit
.
setFirstRemarks
(
""
);
}
audit
.
setAuditId
(
tUser
.
getId
());
}
else
{
//如果层级是复审,设置复审时间
audit
.
setSecondTime
(
LocalDateTime
.
now
());
...
...
@@ -332,7 +332,7 @@ public class AuditController extends BaseController {
return
getFailResult
(
"id参数有误"
);
}
TUser
tUser
=
getcurUser
();
audit
.
setAuditId
(
tUser
.
getId
());
//设置修改的审核状态
audit
.
setStatus
(
auditStatusParam
.
getStatus
());
//为啥数据库有null值
...
...
@@ -342,6 +342,7 @@ public class AuditController extends BaseController {
//初审
if
(
AuditStatusEnum
.
TBC
.
name
().
equals
(
audit
.
getLevel
()))
{
audit
.
setFirstRemarks
(
auditStatusParam
.
getRemarks
());
audit
.
setAuditId
(
tUser
.
getId
());
}
//复审
if
(
AuditStatusEnum
.
TBCA
.
name
().
equals
(
audit
.
getLevel
()))
{
...
...
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