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
223f16fd
Commit
223f16fd
authored
Aug 01, 2024
by
刘凡
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*)修改问题列表报错
parent
d7ea3d47
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
DPSubBizMapper.xml
...atistics-api/src/main/resources/mapper/DPSubBizMapper.xml
+1
-0
DPSubController.java
...boot/module/statistcs/biz/controller/DPSubController.java
+3
-1
DPSubBizServiceImpl.java
...odule/statistcs/biz/service/impl/DPSubBizServiceImpl.java
+4
-1
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/DPSubBizMapper.xml
View file @
223f16fd
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
<select
id=
"queryForSafetyProblemTracingList"
resultType=
"java.util.Map"
>
<select
id=
"queryForSafetyProblemTracingList"
resultType=
"java.util.Map"
>
select
select
date_format(spt.problem_time, '%Y-%m-%d %H:%i:%S') AS problemTime,
spt.*,
spt.*,
(select extend::json->>'pic' from cb_data_dictionary where type = 'ISSUE_TYPE' and code = spt.problem_type_code) problemTypePic
(select extend::json->>'pic' from cb_data_dictionary where type = 'ISSUE_TYPE' and code = spt.problem_type_code) problemTypePic
from tzs_safety_problem_tracing spt
from tzs_safety_problem_tracing spt
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/DPSubController.java
View file @
223f16fd
...
@@ -46,8 +46,10 @@ public class DPSubController {
...
@@ -46,8 +46,10 @@ public class DPSubController {
if
(
ValidationUtil
.
isEmpty
(
param
.
get
(
"equList"
))){
if
(
ValidationUtil
.
isEmpty
(
param
.
get
(
"equList"
))){
param
.
put
(
"equList"
,
param
.
get
(
"EQU_LIST_CODE"
));
param
.
put
(
"equList"
,
param
.
get
(
"EQU_LIST_CODE"
));
}
}
if
(!
ValidationUtil
.
isEmpty
(
param
.
get
(
"equListCode"
))){
if
(!
ValidationUtil
.
isEmpty
(
param
.
get
(
"equListCode"
))){
// 问题列表关联设备
param
.
put
(
"equList"
,
param
.
get
(
"equListCode"
));
param
.
put
(
"equList"
,
param
.
get
(
"equListCode"
));
param
.
put
(
"EQU_LIST_CODE"
,
param
.
get
(
"equListCode"
));
param
.
put
(
"SEQUENCE_NBR"
,
param
.
get
(
"record"
));
}
}
Assert
.
notNull
(
param
.
get
(
"record"
),
"设备ID不能为空"
);
Assert
.
notNull
(
param
.
get
(
"record"
),
"设备ID不能为空"
);
Assert
.
notNull
(
param
.
get
(
"equList"
),
"设备种类不能为空"
);
Assert
.
notNull
(
param
.
get
(
"equList"
),
"设备种类不能为空"
);
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubBizServiceImpl.java
View file @
223f16fd
...
@@ -3,7 +3,10 @@ package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
...
@@ -3,7 +3,10 @@ package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
import
com.yeejoin.amos.boot.module.statistics.api.mapper.DPSubBizMapper
;
import
com.yeejoin.amos.boot.module.statistics.api.mapper.DPSubBizMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.core.foundation.utils.DateTimeUtil
;
import
org.typroject.tyboot.core.foundation.utils.DateUtil
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -56,7 +59,7 @@ public class DPSubBizServiceImpl {
...
@@ -56,7 +59,7 @@ public class DPSubBizServiceImpl {
map
.
put
(
"key"
,
x
.
get
(
"sequence_nbr"
));
map
.
put
(
"key"
,
x
.
get
(
"sequence_nbr"
));
map
.
put
(
"type"
,
x
.
get
(
"problem_type"
));
map
.
put
(
"type"
,
x
.
get
(
"problem_type"
));
map
.
put
(
"descr"
,
x
.
get
(
"problem_desc"
));
map
.
put
(
"descr"
,
x
.
get
(
"problem_desc"
));
map
.
put
(
"createDate"
,
x
.
get
(
"problem
_t
ime"
));
map
.
put
(
"createDate"
,
x
.
get
(
"problem
T
ime"
));
return
map
;
return
map
;
})
})
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
...
...
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