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
32d08064
Commit
32d08064
authored
Apr 19, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
658a7841
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
0 additions
and
22 deletions
+0
-22
Audit.java
src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java
+0
-4
AuditServiceImpl.java
...energy/chnmuseum/party/service/impl/AuditServiceImpl.java
+0
-1
ExhibitionBoardController.java
...useum/party/web/controller/ExhibitionBoardController.java
+0
-4
LearningContentController.java
...useum/party/web/controller/LearningContentController.java
+0
-3
TUserController.java
...nergy/chnmuseum/party/web/controller/TUserController.java
+0
-5
VideoContentController.java
...hnmuseum/party/web/controller/VideoContentController.java
+0
-3
AuditMapper.xml
src/main/resources/mapper/AuditMapper.xml
+0
-2
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java
View file @
32d08064
...
...
@@ -83,10 +83,6 @@ public class Audit implements Serializable {
@TableField
(
value
=
"second_time"
,
fill
=
FieldFill
.
INSERT_UPDATE
)
private
LocalDateTime
secondTime
;
@ApiModelProperty
(
"0:未删除,1:已删除"
)
@TableField
(
"is_deleted"
)
private
Boolean
deleted
;
@ApiModelProperty
(
"初审意见"
)
@TableField
(
"first_remarks"
)
private
String
firstRemarks
;
...
...
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java
View file @
32d08064
...
...
@@ -362,7 +362,6 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
//
audit
.
setLevel
(
AuditStatusEnum
.
TBC
.
name
());
audit
.
setStatus
(
AuditStatusEnum
.
TBC
.
name
());
audit
.
setDeleted
(
false
);
audit
.
setCreateTime
(
LocalDateTime
.
now
());
//
Object
principal
=
SecurityUtils
.
getSubject
().
getPrincipal
();
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @
32d08064
...
...
@@ -98,7 +98,6 @@ public class ExhibitionBoardController extends BaseController {
.
type
(
AuditTypeEnum
.
EXHIBITION_BOARD
.
name
())
.
operation
(
AuditOperationEnum
.
ADD
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
this
.
auditService
.
save
(
audit
);
...
...
@@ -160,7 +159,6 @@ public class ExhibitionBoardController extends BaseController {
.
type
(
AuditTypeEnum
.
EXHIBITION_BOARD
.
name
())
.
operation
(
AuditOperationEnum
.
EDIT
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
this
.
auditService
.
save
(
audit
);
...
...
@@ -393,7 +391,6 @@ public class ExhibitionBoardController extends BaseController {
.
type
(
AuditTypeEnum
.
EXHIBITION_BOARD
.
name
())
.
operation
(
isPublish
?
AuditOperationEnum
.
UPPER
.
name
()
:
AuditOperationEnum
.
LOWER
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
this
.
auditService
.
save
(
audit
);
...
...
@@ -417,7 +414,6 @@ public class ExhibitionBoardController extends BaseController {
.
type
(
AuditTypeEnum
.
EXHIBITION_BOARD
.
name
())
.
operation
(
AuditOperationEnum
.
REMOVE
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
final
boolean
result
=
this
.
auditService
.
save
(
audit
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java
View file @
32d08064
...
...
@@ -132,7 +132,6 @@ public class LearningContentController extends BaseController {
.
userId
(
tUser
.
getId
())
.
operation
(
AuditOperationEnum
.
ADD
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
this
.
auditService
.
save
(
audit
);
...
...
@@ -199,7 +198,6 @@ public class LearningContentController extends BaseController {
.
type
(
AuditTypeEnum
.
LEARNING_CONTENT
.
name
())
.
operation
(
AuditOperationEnum
.
EDIT
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
this
.
auditService
.
save
(
audit
);
...
...
@@ -498,7 +496,6 @@ public class LearningContentController extends BaseController {
.
type
(
AuditTypeEnum
.
LEARNING_CONTENT
.
name
())
.
operation
(
isPublish
?
AuditOperationEnum
.
ENABLE
.
name
()
:
AuditOperationEnum
.
DISABLE
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
this
.
auditService
.
save
(
audit
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
View file @
32d08064
...
...
@@ -21,7 +21,6 @@ import cn.wisenergy.chnmuseum.party.service.impl.TBoxOperationServiceImpl;
import
cn.wisenergy.chnmuseum.party.service.impl.TOrganServiceImpl
;
import
cn.wisenergy.chnmuseum.party.web.controller.base.BaseController
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
@@ -30,10 +29,7 @@ import io.swagger.annotations.ApiOperation;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.shiro.authz.annotation.RequiresAuthentication
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
...
...
@@ -458,7 +454,6 @@ public class TUserController extends BaseController {
audit
.
setType
(
AuditTypeEnum
.
ACCOUNT
.
name
());
audit
.
setOperation
(
AuditOperationEnum
.
DISABLE
.
name
());
audit
.
setStatus
(
AuditStatusEnum
.
TBC
.
name
());
audit
.
setDeleted
(
false
);
audit
.
setLevel
(
AuditStatusEnum
.
TBC
.
name
());
audit
.
setCreateTime
(
LocalDateTime
.
now
());
auditService
.
save
(
audit
);
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentController.java
View file @
32d08064
...
...
@@ -93,7 +93,6 @@ public class VideoContentController extends BaseController {
.
type
(
AuditTypeEnum
.
VIDEO_CONTENT
.
name
())
.
operation
(
AuditOperationEnum
.
ADD
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
this
.
auditService
.
save
(
audit
);
...
...
@@ -141,7 +140,6 @@ public class VideoContentController extends BaseController {
.
type
(
AuditTypeEnum
.
VIDEO_CONTENT
.
name
())
.
operation
(
AuditOperationEnum
.
EDIT
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
this
.
auditService
.
save
(
audit
);
...
...
@@ -315,7 +313,6 @@ public class VideoContentController extends BaseController {
.
type
(
AuditTypeEnum
.
VIDEO_CONTENT
.
name
())
.
operation
(
AuditOperationEnum
.
REMOVE
.
name
())
.
status
(
AuditStatusEnum
.
TBC
.
name
())
.
deleted
(
false
)
.
level
(
AuditStatusEnum
.
TBC
.
name
())
.
build
();
final
boolean
result
=
this
.
auditService
.
save
(
audit
);
...
...
src/main/resources/mapper/AuditMapper.xml
View file @
32d08064
...
...
@@ -15,7 +15,6 @@
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"first_time"
property=
"firstTime"
/>
<result
column=
"second_time"
property=
"secondTime"
/>
<result
column=
"is_deleted"
property=
"deleted"
/>
<result
column=
"first_remarks"
property=
"firstRemarks"
/>
<result
column=
"second_remarks"
property=
"secondRemarks"
/>
<result
column=
"level"
property=
"level"
/>
...
...
@@ -40,7 +39,6 @@
<if
test=
"user.orgCode != null and user.orgCode != ''"
>
and o.code LIKE concat(#{user.orgCode}, '%')
</if>
and a.is_deleted = false
and a.type = 'ACCOUNT'
and a.operation = 'DISABLE'
order by a.create_time desc
...
...
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