选择设备接口 加上设备名称筛选

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EquipmentController.java

@@ -398,9 +398,9 @@ public class EquipmentController {
 
 	@ApiOperation(value = "分类选择设备列表")
 	@GetMapping("/getEquipmentList")
-	public BaseResponse getEquipmentList() {
+	public BaseResponse getEquipmentList(String name) {
 		try {
-			return equipmentService.getEquipmentList();
+			return equipmentService.getEquipmentList(name);
 		} catch (Exception e) {
 			log.debug("分类选择设备列表{}", e);
 		}

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

@@ -23,7 +23,7 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
 
 	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);
 

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

@@ -36,6 +36,9 @@
         left join supplier s on s.id = t.supplier_id
         left join equipment_type et on et.id = t.type
         where t.status = 1
+        <if test="name != null and name != ''">
+            and t.name like concat('%', #{name}, '%')
+        </if>
         ORDER BY t.id DESC
     </select>
 

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

@@ -18,6 +18,10 @@
         ) as members
         from equipment_type et
         where et.status = 1
+
+
+
+
     </select>
 
 

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

@@ -80,10 +80,8 @@ public interface IEquipmentService extends IService<Equipment> {
 
 	BaseResponse<List<EquipmentType>> getTypeList();
 
-	BaseResponse<List<EquipmentTypeVo>> getEquipmentList();
+	BaseResponse<List<EquipmentTypeVo>> getEquipmentList(String name);
 
 	BaseResponse<String> changeType(Integer id, Integer typeId);
 
-
-
 }

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

@@ -896,9 +896,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 	 * @return
 	 */
 	@Override
-	public BaseResponse<List<EquipmentTypeVo>> getEquipmentList() {
+	public BaseResponse<List<EquipmentTypeVo>> getEquipmentList(String name) {
 		List<EquipmentTypeVo> listType = equipmentTypeMapper.getEqTypeList();
-		List<EquipmentVo> listEQ = equipmentMapper.getEQList();
+		List<EquipmentVo> listEQ = equipmentMapper.getEQList(name);
 		if(listType != null && listType.size()>0){
 			for(EquipmentTypeVo listTypevo : listType){
 				List<EquipmentVo> listVo = new ArrayList<>();