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
80b99f4e
Commit
80b99f4e
authored
Jun 15, 2022
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
4e7623b9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
PlanTaskServiceImpl.java
...aintenance/business/service/impl/PlanTaskServiceImpl.java
+8
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java
View file @
80b99f4e
...
@@ -40,6 +40,7 @@ import org.springframework.data.domain.Page;
...
@@ -40,6 +40,7 @@ import org.springframework.data.domain.Page;
import
org.springframework.data.domain.PageImpl
;
import
org.springframework.data.domain.PageImpl
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
...
@@ -86,6 +87,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
...
@@ -86,6 +87,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Autowired
@Autowired
JCSFeignClient
jcsFeignClient
;
JCSFeignClient
jcsFeignClient
;
@Autowired
ICheckInputDao
checkInputDao
;
@Override
@Override
public
Page
<
HashMap
<
String
,
Object
>>
getPlanTaskInfo
(
PlanTaskPageParam
params
)
{
public
Page
<
HashMap
<
String
,
Object
>>
getPlanTaskInfo
(
PlanTaskPageParam
params
)
{
long
total
=
planTaskMapper
.
countPlanTask
(
params
);
long
total
=
planTaskMapper
.
countPlanTask
(
params
);
...
@@ -760,6 +764,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
...
@@ -760,6 +764,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
PlanTask
planTask
=
iplanTaskDao
.
findById
(
planTaskDetail
.
getTaskNo
()).
orElseThrow
(()
->
new
RuntimeException
(
"主任务不存在"
));
PlanTask
planTask
=
iplanTaskDao
.
findById
(
planTaskDetail
.
getTaskNo
()).
orElseThrow
(()
->
new
RuntimeException
(
"主任务不存在"
));
Map
<
String
,
Object
>
facility
=
this
.
buildFacilityDetail
(
point
,
planTask
);
Map
<
String
,
Object
>
facility
=
this
.
buildFacilityDetail
(
point
,
planTask
);
List
<
Map
<
String
,
Object
>>
itemList
=
this
.
buildCheckInputItem
(
routePointId
);
List
<
Map
<
String
,
Object
>>
itemList
=
this
.
buildCheckInputItem
(
routePointId
);
// 修复bug:6131
CheckInput
checkInput
=
checkInputDao
.
findByCheckId
(
Long
.
valueOf
(
planTaskDetailId
));
Map
<
String
,
Object
>
map
=
itemList
.
get
(
0
);
map
.
put
(
"inputValue"
,
ObjectUtils
.
isEmpty
(
checkInput
)
?
""
:
checkInput
.
getInputValue
());
result
.
put
(
"facility"
,
facility
);
result
.
put
(
"facility"
,
facility
);
result
.
put
(
"itemList"
,
itemList
);
result
.
put
(
"itemList"
,
itemList
);
return
result
;
return
result
;
...
...
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