设备管理优化

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentTroubleshootingMapper.xml

@@ -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"/>

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java

@@ -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);