Commit a38b0415 authored by 竹天卫's avatar 竹天卫

设备管理优化

parent a992516f
......@@ -11,7 +11,7 @@
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.EquipmentTroubleshootingVo">
SELECT et.*,
e.name as name, e.code as code, e.brand as brand, e.model as model
e.name as equipmentName, e.code as code, e.brand as brand, e.model as model
FROM equipment_troubleshooting et
left join equipment e on e.id = et.equipment_id
<include refid="where"/>
......
......@@ -408,7 +408,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
public BaseResponse<IPage<EquipmentTroubleshootingVo>> getTroubleshootingPage(PageQuery pageQuery,
String name) {
Map<String, Object> params = new HashMap<>();
params.put("equipmentId", name);
params.put("name", name);
Page<EquipmentTroubleshootingVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<EquipmentTroubleshootingVo> pages = troubleshootingMapper.getPage(page, params);
return BaseResponse.okData(pages);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment