设备台账返回工作中心名称，检索条件加入工作中心ID和设备位置

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/EquipmentVO.java

@@ -53,4 +53,8 @@ public class EquipmentVO extends EquipmentEntity {
 	 * 状态名称
 	 */
 	String statusName;
+	/**
+	 * 工作中心名称
+	 */
+	String workCenterName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java

@@ -99,10 +99,12 @@ public class EquipmentController extends BladeController {
 			@Parameter(name = "typeName", description = "类别名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 			@Parameter(name = "used", description = "服役状态", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")),
 			@Parameter(name = "virtualMac", description = "虚拟设备", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+			@Parameter(name = "workCenterId", description = "作业中心ID", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")),
+			@Parameter(name = "equipmentLocation", description = "设备位置", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 	})
 	public R<IPage<EquipmentVO>> page(@Parameter(hidden = true)EquipmentEntity equipment, Query query) {
-		IPage<EquipmentEntity> pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
-		return R.data(EquipmentWrapper.build().pageVO(pages));
+		IPage<EquipmentVO> pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
+		return R.data(pages);
 	}
 
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.java

@@ -25,7 +25,7 @@ public interface EquipmentMapper extends BaseMapper<EquipmentEntity> {
 	 * @param equipment 查询参数
 	 * @return List<EquipmentVO>
 	 */
-	List<EquipmentEntity> selectEquipmentPage(IPage page, EquipmentEntity equipment);
+	List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentEntity equipment);
 
 
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml

@@ -38,8 +38,37 @@
         <result column="fault_count" property="faultCount" javaType="java.lang.Integer"/>
     </resultMap>
 
-    <select id="selectEquipmentPage" resultMap="equipmentResultMap">
-        select * from MES_EQUIPMENT where is_deleted = 0
+    <select id="selectEquipmentPage" resultType="org.springblade.desk.device.pojo.vo.EquipmentVO">
+        select
+        e.*,
+        wc.WC_NAME as workCenterName
+        from MES_EQUIPMENT e LEFT JOIN BA_WORK_CENTER wc ON e.WORK_CENTER_ID = wc.ID
+        WHERE e.IS_DELETED = 0
+        <if test="equipment.deviceCode != null and equipment.deviceCode != ''">
+            AND e.DEVICE_CODE LIKE CONCAT('%', CONCAT(#{equipment.deviceCode}, '%'))
+        </if>
+        <if test="equipment.deviceName != null and equipment.deviceName != ''">
+            AND e.DEVICE_NAME LIKE CONCAT('%', CONCAT(#{equipment.deviceName}, '%'))
+        </if>
+        <if test="equipment.category != null and equipment.category != ''">
+            AND e.CATEGORY LIKE CONCAT('%', CONCAT(#{equipment.category}, '%'))
+        </if>
+        <if test="equipment.typeName != null and equipment.typeName != ''">
+            AND e.TYPE_NAME LIKE CONCAT('%', CONCAT(#{equipment.typeName}, '%'))
+        </if>
+        <if test="equipment.equipmentLocation != null and equipment.equipmentLocation != ''">
+            AND e.EQUIPMENT_LOCATION LIKE CONCAT('%', CONCAT(#{equipment.equipmentLocation}, '%'))
+        </if>
+        <if test="equipment.used != null">
+            AND e.USED = #{equipment.used}
+        </if>
+        <if test="equipment.virtualMac != null">
+            AND e.VIRTUAL_MAC = #{equipment.virtualMac}
+        </if>
+        <if test="equipment.workCenterId != null">
+            AND wc.ID = #{equipment.workCenterId}
+        </if>
+        ORDER BY e.CREATE_TIME DESC
     </select>
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IEquipmentService.java

@@ -48,7 +48,7 @@ public interface IEquipmentService extends BaseService<EquipmentEntity> {
 	 * @param equipment 查询参数
 	 * @return IPage<EquipmentVO>
 	 */
-	IPage<EquipmentEntity> selectEquipmentPage(IPage<EquipmentEntity> page, EquipmentEntity equipment);
+	IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentEntity equipment);
 
 
 	/**

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java

@@ -57,23 +57,24 @@ public class EquipmentServiceImpl extends BaseServiceImpl<EquipmentMapper, Equip
 			.version(HttpClient.Version.HTTP_2)
 			.build();
 	@Override
-	public IPage<EquipmentEntity> selectEquipmentPage(IPage<EquipmentEntity> page, EquipmentEntity equipment) {
+	public IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentEntity equipment) {
 //		return page.setRecords(baseMapper.selectEquipmentPage(page, equipment));
 		// 1. 创建条件构造器
-		LambdaQueryWrapper<EquipmentEntity> wrapper = Wrappers.<EquipmentEntity>lambdaQuery();
-
-		// 2. 动态添加条件（核心！）
-		// 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件
-		wrapper.like(Objects.nonNull(equipment.getDeviceCode()), EquipmentEntity::getDeviceCode, equipment.getDeviceCode())
-				.like(Objects.nonNull(equipment.getDeviceName()), EquipmentEntity::getDeviceName, equipment.getDeviceName())
-				.like(Objects.nonNull(equipment.getCategory()), EquipmentEntity::getCategory, equipment.getCategory())
-				.like(Objects.nonNull(equipment.getTypeName()), EquipmentEntity::getTypeName, equipment.getTypeName())
-				.like(Objects.nonNull(equipment.getEquipmentLocation()), EquipmentEntity::getEquipmentLocation, equipment.getEquipmentLocation())
-				.eq(Objects.nonNull(equipment.getUsed()), EquipmentEntity::getUsed, equipment.getUsed())
-				.eq(Objects.nonNull(equipment.getVirtualMac()), EquipmentEntity::getVirtualMac, equipment.getVirtualMac())
-				.eq(Objects.nonNull(equipment.getWorkCenterId()), EquipmentEntity::getWorkCenterId, equipment.getWorkCenterId());
+//		LambdaQueryWrapper<EquipmentEntity> wrapper = Wrappers.<EquipmentEntity>lambdaQuery();
+//
+//		// 2. 动态添加条件（核心！）
+//		// 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件
+//		wrapper.like(Objects.nonNull(equipment.getDeviceCode()), EquipmentEntity::getDeviceCode, equipment.getDeviceCode())
+//				.like(Objects.nonNull(equipment.getDeviceName()), EquipmentEntity::getDeviceName, equipment.getDeviceName())
+//				.like(Objects.nonNull(equipment.getCategory()), EquipmentEntity::getCategory, equipment.getCategory())
+//				.like(Objects.nonNull(equipment.getTypeName()), EquipmentEntity::getTypeName, equipment.getTypeName())
+//				.like(Objects.nonNull(equipment.getEquipmentLocation()), EquipmentEntity::getEquipmentLocation, equipment.getEquipmentLocation())
+//				.eq(Objects.nonNull(equipment.getUsed()), EquipmentEntity::getUsed, equipment.getUsed())
+//				.eq(Objects.nonNull(equipment.getVirtualMac()), EquipmentEntity::getVirtualMac, equipment.getVirtualMac())
+//				.eq(Objects.nonNull(equipment.getWorkCenterId()), EquipmentEntity::getWorkCenterId, equipment.getWorkCenterId());
 		// 3. 执行分页查询
-		return baseMapper.selectPage(page, wrapper);
+		List<EquipmentVO> equipmentVOS = baseMapper.selectEquipmentPage(page, equipment);
+		return page.setRecords(equipmentVOS);
 	}