Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
operation-control-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王锦盛
operation-control-platform
Commits
86fe61ed
Commit
86fe61ed
authored
Mar 18, 2022
by
胡秀武
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
胡秀武:模型列表基础信息属性信息bug修复
parent
8a336758
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
+3
-3
No files found.
src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
View file @
86fe61ed
...
@@ -228,7 +228,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
...
@@ -228,7 +228,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
private
ResponseVO
getModelInfoList
(
String
modelCode
,
Integer
currentPage
,
Integer
pageSize
,
String
searchCondition
)
{
private
ResponseVO
getModelInfoList
(
String
modelCode
,
Integer
currentPage
,
Integer
pageSize
,
String
searchCondition
)
{
QueryWrapper
<
Model
>
queryWrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
Model
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"model_group_code"
,
modelCode
)
queryWrapper
.
eq
(
"model_group_code"
,
modelCode
)
.
like
(
StringUtils
.
isNotEmpty
(
searchCondition
),
"
ocp_model_prop
"
,
searchCondition
)
.
like
(
StringUtils
.
isNotEmpty
(
searchCondition
),
"
model_name
"
,
searchCondition
)
.
orderByDesc
(
"model_ctime"
);
.
orderByDesc
(
"model_ctime"
);
List
<
Model
>
modelList
=
modelMapper
.
selectList
(
queryWrapper
);
List
<
Model
>
modelList
=
modelMapper
.
selectList
(
queryWrapper
);
PageUtil
<
Model
>
pageUtil
=
new
PageUtil
<>();
PageUtil
<
Model
>
pageUtil
=
new
PageUtil
<>();
...
@@ -252,11 +252,11 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
...
@@ -252,11 +252,11 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
modelWrapper
.
eq
(
"model_code"
,
modelCode
);
modelWrapper
.
eq
(
"model_code"
,
modelCode
);
List
<
Model
>
modelList
=
modelMapper
.
selectList
(
modelWrapper
);
List
<
Model
>
modelList
=
modelMapper
.
selectList
(
modelWrapper
);
proWrapper
.
eq
(
"model_code"
,
modelCode
)
proWrapper
.
eq
(
"model_code"
,
modelCode
)
.
like
(
StringUtils
.
isNotEmpty
(
searchCondition
),
"column_
name
"
,
searchCondition
)
.
like
(
StringUtils
.
isNotEmpty
(
searchCondition
),
"column_
comments
"
,
searchCondition
)
.
orderByDesc
(
"prop_ctime"
);
.
orderByDesc
(
"prop_ctime"
);
List
<
ModelProperty
>
modelPropertiesList
=
modelPropertyMapper
.
selectList
(
proWrapper
);
List
<
ModelProperty
>
modelPropertiesList
=
modelPropertyMapper
.
selectList
(
proWrapper
);
modelPropertiesList
.
forEach
(
pro
->
modelPropertiesList
.
forEach
(
pro
->
pro
.
setModelTable
(
modelList
.
get
(
0
)
==
null
?
""
:
modelList
.
get
(
0
).
getModelTable
())
pro
.
setModelTable
(
modelList
.
get
(
0
)
==
null
?
""
:
modelList
.
get
(
0
).
getModelTable
())
);
);
PageUtil
<
ModelProperty
>
pageUtil
=
new
PageUtil
<>();
PageUtil
<
ModelProperty
>
pageUtil
=
new
PageUtil
<>();
pageUtil
.
startPage
(
currentPage
,
pageSize
,
modelPropertiesList
);
pageUtil
.
startPage
(
currentPage
,
pageSize
,
modelPropertiesList
);
...
...
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