Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety-progress
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
耿迪迪
gassafety-progress
Commits
a6a9632f
Commit
a6a9632f
authored
Apr 06, 2022
by
wuqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2022-4-6 吴卿华
parent
7b766bcc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
144 additions
and
58 deletions
+144
-58
THiddenTroubleInfoSController.java
...b/controller/supervise/THiddenTroubleInfoSController.java
+5
-0
THiddenTroubleInfo.java
...ain/java/com/zehong/system/domain/THiddenTroubleInfo.java
+1
-1
index.vue
gassafetyprogress-web/src/views/system/info/index.vue
+138
-57
No files found.
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/THiddenTroubleInfoSController.java
View file @
a6a9632f
package
com
.
zehong
.
web
.
controller
.
supervise
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.List
;
import
com.zehong.common.core.domain.entity.SysUser
;
...
...
@@ -85,6 +87,9 @@ public class THiddenTroubleInfoSController extends BaseController
//获取用户信息
SysUser
user
=
SecurityUtils
.
getLoginUser
().
getUser
();
tHiddenTroubleInfo
.
setBeyondEnterpriseId
(
user
.
getDeptId
());
tHiddenTroubleInfo
.
setReportPerson
(
user
.
getNickName
());
SimpleDateFormat
dateTime
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
//设置日期格式
tHiddenTroubleInfo
.
setReportTime
(
dateTime
.
format
(
new
Date
()));
return
toAjax
(
tHiddenTroubleInfoService
.
insertTHiddenTroubleInfo
(
tHiddenTroubleInfo
));
}
...
...
gassafetyprogress-system/src/main/java/com/zehong/system/domain/THiddenTroubleInfo.java
View file @
a6a9632f
...
...
@@ -55,7 +55,7 @@ public class THiddenTroubleInfo extends BaseEntity
private
String
hiddenTroubleDescribe
;
/** 上报时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@Excel
(
name
=
"上报时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
private
String
reportTime
;
...
...
gassafetyprogress-web/src/views/system/info/index.vue
View file @
a6a9632f
This diff is collapsed.
Click to expand it.
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