From f90623e18b054dfe96618d664467a01294e706b0 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 17 Oct 2025 18:09:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(eqp):=20=E5=AE=9E=E7=8E=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=E5=88=86=E9=A1=B5=E8=81=94=E6=9F=A5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-PagePlus 新增 selectVo 接口支持关联查询
- 修改 EquipmentManagement、EquipmentParam 和 TypeParam 的分页查询逻辑
- 在 VO 对象中增加类型名称和设备名称字段用于展示- 更新 Mapper XML 文件中的 SQL 查询语句以支持左连接查询
- 调整 Service 层实现使用新的分页方法获取数据列表
---
 .../domain/vo/EqpEquipmentManagementVo.java   |  6 ++++
 .../eqp/domain/vo/EqpEquipmentParamVo.java    |  3 ++
 .../klp/mes/eqp/domain/vo/EqpTypeParamVo.java |  3 ++
 .../mapper/EqpEquipmentManagementMapper.java  | 10 +++++++
 .../eqp/mapper/EqpEquipmentParamMapper.java   |  4 +++
 .../mes/eqp/mapper/EqpTypeParamMapper.java    |  4 +++
 .../EqpEquipmentManagementServiceImpl.java    |  8 +++--
 .../impl/EqpEquipmentParamServiceImpl.java    |  7 +++--
 .../service/impl/EqpTypeParamServiceImpl.java |  7 +++--
 .../eqp/EqpEquipmentManagementMapper.xml      | 29 +++++++++++++++++++
 .../mapper/eqp/EqpEquipmentParamMapper.xml    | 20 +++++++++++++
 .../mapper/eqp/EqpTypeParamMapper.xml         | 21 ++++++++++++++
 12 files changed, 116 insertions(+), 6 deletions(-)

diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentManagementVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentManagementVo.java
index 9e7ef5cf..25d1706b 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentManagementVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentManagementVo.java
@@ -45,6 +45,12 @@ public class EqpEquipmentManagementVo {
     @ExcelProperty(value = "设备类型ID")
     private Long typeId;
 
+    /**
+     * 设备类型名称
+     */
+    @ExcelProperty(value = "设备类型名称")
+    private String typeName;
+
     /**
      * 设备编码
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentParamVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentParamVo.java
index ee532dea..2227d2fe 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentParamVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpEquipmentParamVo.java
@@ -69,5 +69,8 @@ public class EqpEquipmentParamVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    @ExcelProperty(value = "设备名称")
+    private String equipmentName;
+
 
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpTypeParamVo.java b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpTypeParamVo.java
index 6f7bb59f..2739790c 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpTypeParamVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/domain/vo/EqpTypeParamVo.java
@@ -77,5 +77,8 @@ public class EqpTypeParamVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    //类型名称
+    @ExcelProperty(value = "类型名称")
+    private String typeName;
 
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentManagementMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentManagementMapper.java
index d64af399..ffaa7a2c 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentManagementMapper.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentManagementMapper.java
@@ -1,5 +1,10 @@
 package com.klp.mes.eqp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
 import com.klp.mes.eqp.domain.EqpEquipmentManagement;
 import com.klp.mes.eqp.domain.vo.EqpEquipmentManagementVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
@@ -12,4 +17,9 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface EqpEquipmentManagementMapper extends BaseMapperPlus<EqpEquipmentManagementMapper, EqpEquipmentManagement, EqpEquipmentManagementVo> {
 
+    /**
+     * 分页联查设备类型名称
+     */
+    Page<EqpEquipmentManagementVo> selectVoPagePlus(Page<EqpEquipmentManagementVo> page, @Param("ew") LambdaQueryWrapper<EqpEquipmentManagement> lqw);
+
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentParamMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentParamMapper.java
index d4d3cde3..a874b02f 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentParamMapper.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpEquipmentParamMapper.java
@@ -1,8 +1,11 @@
 package com.klp.mes.eqp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.mes.eqp.domain.EqpEquipmentParam;
 import com.klp.mes.eqp.domain.vo.EqpEquipmentParamVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备参数Mapper接口
@@ -12,4 +15,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface EqpEquipmentParamMapper extends BaseMapperPlus<EqpEquipmentParamMapper, EqpEquipmentParam, EqpEquipmentParamVo> {
 
+    Page<EqpEquipmentParamVo> selectVoPagePlus(Page<Object> build,@Param("ew") LambdaQueryWrapper<EqpEquipmentParam> lqw);
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpTypeParamMapper.java b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpTypeParamMapper.java
index 9baffbc5..a51013bd 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpTypeParamMapper.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/mapper/EqpTypeParamMapper.java
@@ -1,8 +1,11 @@
 package com.klp.mes.eqp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.mes.eqp.domain.EqpTypeParam;
 import com.klp.mes.eqp.domain.vo.EqpTypeParamVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备类型参数（某类设备的通用参数标准）Mapper接口
@@ -12,4 +15,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface EqpTypeParamMapper extends BaseMapperPlus<EqpTypeParamMapper, EqpTypeParam, EqpTypeParamVo> {
 
+    Page<EqpTypeParamVo> selectVoPagePlus(Page<Object> build,@Param("ew") LambdaQueryWrapper<EqpTypeParam> lqw);
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentManagementServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentManagementServiceImpl.java
index 0872d3b6..8fa14c5b 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentManagementServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentManagementServiceImpl.java
@@ -45,7 +45,7 @@ public class EqpEquipmentManagementServiceImpl implements IEqpEquipmentManagemen
     @Override
     public TableDataInfo<EqpEquipmentManagementVo> queryPageList(EqpEquipmentManagementBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<EqpEquipmentManagement> lqw = buildQueryWrapper(bo);
-        Page<EqpEquipmentManagementVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<EqpEquipmentManagementVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -55,7 +55,11 @@ public class EqpEquipmentManagementServiceImpl implements IEqpEquipmentManagemen
     @Override
     public List<EqpEquipmentManagementVo> queryList(EqpEquipmentManagementBo bo) {
         LambdaQueryWrapper<EqpEquipmentManagement> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        // 使用联查类型名称的 SQL
+        Page<EqpEquipmentManagementVo> build = new PageQuery().build();
+        build.setSize(Long.MAX_VALUE);
+        Page<EqpEquipmentManagementVo> eqpEquipmentManagementVoPage = baseMapper.selectVoPagePlus(build, lqw);
+        return eqpEquipmentManagementVoPage.getRecords();
     }
 
     private LambdaQueryWrapper<EqpEquipmentManagement> buildQueryWrapper(EqpEquipmentManagementBo bo) {
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentParamServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentParamServiceImpl.java
index d15d344f..9a7fd849 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentParamServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentParamServiceImpl.java
@@ -45,7 +45,7 @@ public class EqpEquipmentParamServiceImpl implements IEqpEquipmentParamService {
     @Override
     public TableDataInfo<EqpEquipmentParamVo> queryPageList(EqpEquipmentParamBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<EqpEquipmentParam> lqw = buildQueryWrapper(bo);
-        Page<EqpEquipmentParamVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<EqpEquipmentParamVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -55,7 +55,10 @@ public class EqpEquipmentParamServiceImpl implements IEqpEquipmentParamService {
     @Override
     public List<EqpEquipmentParamVo> queryList(EqpEquipmentParamBo bo) {
         LambdaQueryWrapper<EqpEquipmentParam> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        Page<Object> build = new PageQuery().build();
+        build.setSize(Long.MAX_VALUE);
+        Page<EqpEquipmentParamVo> eqpEquipmentParamVoPage = baseMapper.selectVoPagePlus(build, lqw);
+        return eqpEquipmentParamVoPage.getRecords();
     }
 
     private LambdaQueryWrapper<EqpEquipmentParam> buildQueryWrapper(EqpEquipmentParamBo bo) {
diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpTypeParamServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpTypeParamServiceImpl.java
index 62be07f2..2f4d34a2 100644
--- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpTypeParamServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpTypeParamServiceImpl.java
@@ -45,7 +45,7 @@ public class EqpTypeParamServiceImpl implements IEqpTypeParamService {
     @Override
     public TableDataInfo<EqpTypeParamVo> queryPageList(EqpTypeParamBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<EqpTypeParam> lqw = buildQueryWrapper(bo);
-        Page<EqpTypeParamVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<EqpTypeParamVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -55,7 +55,10 @@ public class EqpTypeParamServiceImpl implements IEqpTypeParamService {
     @Override
     public List<EqpTypeParamVo> queryList(EqpTypeParamBo bo) {
         LambdaQueryWrapper<EqpTypeParam> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        Page<Object> eqpTypeParamVoPage = new Page<>();
+        eqpTypeParamVoPage.setSize(Long.MAX_VALUE);
+        Page<EqpTypeParamVo> eqpTypeParamVoPage1 = baseMapper.selectVoPagePlus(eqpTypeParamVoPage, lqw);
+        return eqpTypeParamVoPage1.getRecords();
     }
 
     private LambdaQueryWrapper<EqpTypeParam> buildQueryWrapper(EqpTypeParamBo bo) {
diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentManagementMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentManagementMapper.xml
index 264203ea..4dc12a03 100644
--- a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentManagementMapper.xml
+++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentManagementMapper.xml
@@ -28,4 +28,33 @@
     </resultMap>
 
 
+    <!-- 分页查询：联查类型名称 -->
+    <select id="selectVoPagePlus" resultType="com.klp.mes.eqp.domain.vo.EqpEquipmentManagementVo">
+        SELECT
+            em.equipment_id,
+            em.equipment_name,
+            em.model,
+            em.type_id,
+            et.type_name AS type_name,
+            em.equipment_code,
+            em.location,
+            em.quantity,
+            em.manager,
+            em.oss_id,
+            em.status,
+            em.stop_reason,
+            em.equipment_destination,
+            em.enable_time,
+            em.retire_time,
+            em.remark
+        FROM eqp_equipment_management em
+        LEFT JOIN eqp_equipment_type et ON em.type_id = et.type_id
+        <where>
+            em.del_flag = '0'
+            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+                AND ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
 </mapper>
diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentParamMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentParamMapper.xml
index c554f737..b0232385 100644
--- a/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentParamMapper.xml
+++ b/klp-mes/src/main/resources/mapper/eqp/EqpEquipmentParamMapper.xml
@@ -19,6 +19,26 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
     </resultMap>
+    <select id="selectVoPagePlus" resultType="com.klp.mes.eqp.domain.vo.EqpEquipmentParamVo">
+        SELECT
+            ep.param_id,
+            ep.param_name,
+            ep.equipment_id,
+            ee.equipment_name AS equipment_name,
+            ep.param_type,
+            ep.param_standard,
+            ep.param_unit,
+            ep.param_source,
+            ep.remark
+        FROM eqp_equipment_param ep
+        LEFT JOIN eqp_equipment_management ee ON ep.equipment_id = ee.equipment_id
+        <where>
+            ep.del_flag = '0'
+            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+                AND ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>
diff --git a/klp-mes/src/main/resources/mapper/eqp/EqpTypeParamMapper.xml b/klp-mes/src/main/resources/mapper/eqp/EqpTypeParamMapper.xml
index 8a8b32f2..9b2ddde9 100644
--- a/klp-mes/src/main/resources/mapper/eqp/EqpTypeParamMapper.xml
+++ b/klp-mes/src/main/resources/mapper/eqp/EqpTypeParamMapper.xml
@@ -20,6 +20,27 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
     </resultMap>
+    <select id="selectVoPagePlus" resultType="com.klp.mes.eqp.domain.vo.EqpTypeParamVo">
+        SELECT
+            tp.type_param_id,
+            tp.type_id,
+            tp.param_name,
+            tp.param_type,
+            tp.param_standard,
+            tp.param_unit,
+            tp.param_source,
+            tp.is_mandatory,
+            tp.remark,
+            t.type_name AS typeName
+        FROM eqp_type_param tp
+        LEFT JOIN eqp_equipment_type t ON tp.type_id = t.type_id
+        <where>
+            tp.del_flag = 0
+            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+                AND ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>