Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
3136ad3e
Commit
3136ad3e
authored
Apr 22, 2021
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
选择设备接口 加上设备名称筛选
parent
9ccf9f5a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
8 deletions
+13
-8
EquipmentController.java
...se/sc/cement/business/controller/EquipmentController.java
+2
-2
EquipmentMapper.java
...va/cn/wise/sc/cement/business/mapper/EquipmentMapper.java
+1
-1
EquipmentMapper.xml
...cn/wise/sc/cement/business/mapper/xml/EquipmentMapper.xml
+3
-0
EquipmentTypeMapper.xml
...ise/sc/cement/business/mapper/xml/EquipmentTypeMapper.xml
+4
-0
IEquipmentService.java
...cn/wise/sc/cement/business/service/IEquipmentService.java
+1
-3
EquipmentServiceImpl.java
...sc/cement/business/service/impl/EquipmentServiceImpl.java
+2
-2
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EquipmentController.java
View file @
3136ad3e
...
@@ -398,9 +398,9 @@ public class EquipmentController {
...
@@ -398,9 +398,9 @@ public class EquipmentController {
@ApiOperation
(
value
=
"分类选择设备列表"
)
@ApiOperation
(
value
=
"分类选择设备列表"
)
@GetMapping
(
"/getEquipmentList"
)
@GetMapping
(
"/getEquipmentList"
)
public
BaseResponse
getEquipmentList
()
{
public
BaseResponse
getEquipmentList
(
String
name
)
{
try
{
try
{
return
equipmentService
.
getEquipmentList
();
return
equipmentService
.
getEquipmentList
(
name
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
debug
(
"分类选择设备列表{}"
,
e
);
log
.
debug
(
"分类选择设备列表{}"
,
e
);
}
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/EquipmentMapper.java
View file @
3136ad3e
...
@@ -23,7 +23,7 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
...
@@ -23,7 +23,7 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
IPage
<
EquipmentVo
>
getPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
IPage
<
EquipmentVo
>
getPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
EquipmentVo
>
getEQList
();
List
<
EquipmentVo
>
getEQList
(
String
name
);
List
<
Map
<
String
,
Object
>>
exportList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
exportList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentMapper.xml
View file @
3136ad3e
...
@@ -36,6 +36,9 @@
...
@@ -36,6 +36,9 @@
left join supplier s on s.id = t.supplier_id
left join supplier s on s.id = t.supplier_id
left join equipment_type et on et.id = t.type
left join equipment_type et on et.id = t.type
where t.status = 1
where t.status = 1
<if
test=
"name != null and name != ''"
>
and t.name like concat('%', #{name}, '%')
</if>
ORDER BY t.id DESC
ORDER BY t.id DESC
</select>
</select>
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentTypeMapper.xml
View file @
3136ad3e
...
@@ -18,6 +18,10 @@
...
@@ -18,6 +18,10 @@
) as members
) as members
from equipment_type et
from equipment_type et
where et.status = 1
where et.status = 1
</select>
</select>
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEquipmentService.java
View file @
3136ad3e
...
@@ -80,10 +80,8 @@ public interface IEquipmentService extends IService<Equipment> {
...
@@ -80,10 +80,8 @@ public interface IEquipmentService extends IService<Equipment> {
BaseResponse
<
List
<
EquipmentType
>>
getTypeList
();
BaseResponse
<
List
<
EquipmentType
>>
getTypeList
();
BaseResponse
<
List
<
EquipmentTypeVo
>>
getEquipmentList
();
BaseResponse
<
List
<
EquipmentTypeVo
>>
getEquipmentList
(
String
name
);
BaseResponse
<
String
>
changeType
(
Integer
id
,
Integer
typeId
);
BaseResponse
<
String
>
changeType
(
Integer
id
,
Integer
typeId
);
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java
View file @
3136ad3e
...
@@ -896,9 +896,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
...
@@ -896,9 +896,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
* @return
* @return
*/
*/
@Override
@Override
public
BaseResponse
<
List
<
EquipmentTypeVo
>>
getEquipmentList
()
{
public
BaseResponse
<
List
<
EquipmentTypeVo
>>
getEquipmentList
(
String
name
)
{
List
<
EquipmentTypeVo
>
listType
=
equipmentTypeMapper
.
getEqTypeList
();
List
<
EquipmentTypeVo
>
listType
=
equipmentTypeMapper
.
getEqTypeList
();
List
<
EquipmentVo
>
listEQ
=
equipmentMapper
.
getEQList
();
List
<
EquipmentVo
>
listEQ
=
equipmentMapper
.
getEQList
(
name
);
if
(
listType
!=
null
&&
listType
.
size
()>
0
){
if
(
listType
!=
null
&&
listType
.
size
()>
0
){
for
(
EquipmentTypeVo
listTypevo
:
listType
){
for
(
EquipmentTypeVo
listTypevo
:
listType
){
List
<
EquipmentVo
>
listVo
=
new
ArrayList
<>();
List
<
EquipmentVo
>
listVo
=
new
ArrayList
<>();
...
...
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