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
e40cf9a0
Commit
e40cf9a0
authored
Apr 01, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
f3d535dc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
29 deletions
+29
-29
AuditServiceImpl.java
...energy/chnmuseum/party/service/impl/AuditServiceImpl.java
+2
-1
AuditController.java
...nergy/chnmuseum/party/web/controller/AuditController.java
+27
-28
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java
View file @
e40cf9a0
...
@@ -72,7 +72,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
...
@@ -72,7 +72,8 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
auditPage
.
setSize
(
page
.
getSize
());
auditPage
.
setSize
(
page
.
getSize
());
//条件
//条件
QueryWrapper
<
Audit
>
ew
=
new
QueryWrapper
<
Audit
>()
QueryWrapper
<
Audit
>
ew
=
new
QueryWrapper
<
Audit
>()
.
eq
(
"a.level"
,
auditStatusLevel
.
name
())
//暂时注掉
// .eq("a.level", auditStatusLevel.name())
.
eq
(
"a.type"
,
type
.
name
())
.
eq
(
"a.type"
,
type
.
name
())
.
orderByDesc
(
"a.create_time"
,
"a.id"
);
.
orderByDesc
(
"a.create_time"
,
"a.id"
);
//
//
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java
View file @
e40cf9a0
...
@@ -228,10 +228,9 @@ public class AuditController extends BaseController {
...
@@ -228,10 +228,9 @@ public class AuditController extends BaseController {
@ApiImplicitParam
(
name
=
"_size"
,
value
=
"返回条数"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"_size"
,
value
=
"返回条数"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"账号名称或提交人"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"name"
,
value
=
"账号名称或提交人"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"待初审:TBC, 驳回:REFUSED,待复审:TBCA, 通过:APPROVED_FINAL"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"待初审:TBC, 驳回:REFUSED,待复审:TBCA, 通过:APPROVED_FINAL"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"level"
,
value
=
"审核级别:TBC,TBCA"
,
paramType
=
"query"
,
dataType
=
"String"
,
required
=
true
),
@ApiImplicitParam
(
name
=
"type"
,
value
=
"视频内容:ASSET,展板内容:EXHIBITION_BOARD,学习内容:LEARNING_CONTENT"
,
paramType
=
"query"
,
dataType
=
"String"
,
required
=
true
)
@ApiImplicitParam
(
name
=
"type"
,
value
=
"视频内容:ASSET,展板内容:EXHIBITION_BOARD,学习内容:LEARNING_CONTENT"
,
paramType
=
"query"
,
dataType
=
"String"
,
required
=
true
)
})
})
public
Map
<
String
,
Object
>
getPageAllList
(
String
name
,
String
status
,
String
level
,
public
Map
<
String
,
Object
>
getPageAllList
(
String
name
,
String
status
,
@NotBlank
(
message
=
"type参数不能为空"
)
String
type
)
{
@NotBlank
(
message
=
"type参数不能为空"
)
String
type
)
{
//分页
//分页
...
@@ -240,32 +239,32 @@ public class AuditController extends BaseController {
...
@@ -240,32 +239,32 @@ public class AuditController extends BaseController {
AuditStatusEnum
auditStatusLevel
=
null
;
AuditStatusEnum
auditStatusLevel
=
null
;
AuditTypeEnum
auditTypeEnum
=
AuditTypeEnum
.
valueOf
(
type
);
AuditTypeEnum
auditTypeEnum
=
AuditTypeEnum
.
valueOf
(
type
);
TUser
user
=
getcurUser
();
//
TUser user = getcurUser();
switch
(
auditTypeEnum
){
//
switch (auditTypeEnum){
case
ASSET:
//
case ASSET:
if
(
user
.
getRoleList
().
contains
(
"9"
)){
//
if (user.getRoleList().contains("9")){
auditStatusLevel
=
AuditStatusEnum
.
TBC
;
//
auditStatusLevel=AuditStatusEnum.TBC;
}
else
{
//
}else {
auditStatusLevel
=
AuditStatusEnum
.
TBCA
;
//
auditStatusLevel=AuditStatusEnum.TBCA;
}
//
}
break
;
//
break;
case
EXHIBITION_BOARD:
//
case EXHIBITION_BOARD:
if
(
user
.
getRoleList
().
contains
(
"11"
)){
//
if (user.getRoleList().contains("11")){
auditStatusLevel
=
AuditStatusEnum
.
TBC
;
//
auditStatusLevel=AuditStatusEnum.TBC;
}
else
{
//
}else {
auditStatusLevel
=
AuditStatusEnum
.
TBCA
;
//
auditStatusLevel=AuditStatusEnum.TBCA;
}
//
}
break
;
//
break;
case
LEARNING_CONTENT:
//
case LEARNING_CONTENT:
if
(
user
.
getRoleList
().
contains
(
"13"
)){
//
if (user.getRoleList().contains("13")){
auditStatusLevel
=
AuditStatusEnum
.
TBC
;
//
auditStatusLevel=AuditStatusEnum.TBC;
}
else
{
//
}else {
auditStatusLevel
=
AuditStatusEnum
.
TBCA
;
//
auditStatusLevel=AuditStatusEnum.TBCA;
}
//
}
break
;
//
break;
//
}
//
}
if
(
auditTypeEnum
==
null
||
auditStatusLevel
==
null
)
{
if
(
auditTypeEnum
==
null
)
{
return
getFailResult
(
"type参数不正确"
);
return
getFailResult
(
"type参数不正确"
);
}
}
if
(
StringUtils
.
isNotBlank
(
status
))
{
if
(
StringUtils
.
isNotBlank
(
status
))
{
...
...
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