From c776ff3fce30e0d39044881e5b0cc2ce1ddae5a3 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 12 May 2025 16:02:38 +0800
Subject: [PATCH] =?UTF-8?q?refactor(dms):=20=E4=BC=98=E5=8C=96=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E5=B7=A5=E5=8D=95=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-将 selectDetailList 方法的返回类型从 DmsBillsMaintDetailVo 改为 DmsBillsMaintDetail
- 将 selectPrjectIds 方法的返回类型从 DmsBaseMaintProjectVo 改为 DmsBaseMaintProject
- 更新相应的 XML 文件以匹配新的返回类型- 在 DmsBillsMaintInstanceServiceImpl 中进行相应的类型转换
---
 .../org/dromara/dms/mapper/DmsBillsMaintDetailMapper.java | 5 +++--
 .../service/impl/DmsBillsMaintInstanceServiceImpl.java    | 8 ++++----
 .../resources/mapper/dms/DmsBillsMaintDetailMapper.xml    | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsMaintDetailMapper.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsMaintDetailMapper.java
index 9b575c2..b50cc64 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsMaintDetailMapper.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/mapper/DmsBillsMaintDetailMapper.java
@@ -1,6 +1,7 @@
 package org.dromara.dms.mapper;
 
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.dms.domain.DmsBaseMaintProject;
 import org.dromara.dms.domain.DmsBillsMaintDetail;
 import org.dromara.dms.domain.DmsBillsMaintInstance;
 import org.dromara.dms.domain.vo.DmsBaseMaintProjectVo;
@@ -25,11 +26,11 @@ public interface DmsBillsMaintDetailMapper extends BaseMapperPlus<DmsBillsMaintD
      */
     public List<DmsBillsMaintDetail> selectDmsBillsMaintDetailJoinList(DmsBillsMaintDetail dmsBillsMaintDetail);
 
-    List<DmsBillsMaintDetailVo> selectDetailList(Long maintInstanceId);
+    List<DmsBillsMaintDetail> selectDetailList(Long maintInstanceId);
 
     DmsBaseMaintStationVo selectMainStation(Long stationId);
 
-    List<DmsBaseMaintProjectVo> selectPrjectIds(Long stationId);
+    List<DmsBaseMaintProject> selectPrjectIds(Long stationId);
 
     /**
      * 查询最新一条保养工单，Join 第一步节点
diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
index 6cfe550..a0efe6b 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
@@ -231,10 +231,10 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
 
         dmsBillsMaintDetailMapper.insertBatch(billsMaintDetails);
         ArrayList<DmsBillsMaintDetailProject> detailprojectList = new ArrayList<>();
-        List<DmsBillsMaintDetailVo> list = dmsBillsMaintDetailMapper.selectDetailList(maintInstanceId);
-        for (DmsBillsMaintDetailVo detail : list) {
-            List<DmsBaseMaintProjectVo> projects = dmsBillsMaintDetailMapper.selectPrjectIds(detail.getMaintStationId());
-            for (DmsBaseMaintProjectVo project : projects) {
+        List<DmsBillsMaintDetail> list = dmsBillsMaintDetailMapper.selectDetailList(maintInstanceId);
+        for (DmsBillsMaintDetail detail : list) {
+            List<DmsBaseMaintProject> projects = dmsBillsMaintDetailMapper.selectPrjectIds(detail.getMaintStationId());
+            for (DmsBaseMaintProject project : projects) {
                 DmsBillsMaintDetailProject detailproject = new DmsBillsMaintDetailProject();
                 detailproject.setBillsMaintDetailId(detail.getBillsMaintDetailId());
 //                DmsBaseMaintStation station = dmsBillsMaintDetailMapper.selectMainStation(detail.getStationId());
diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml
index 5565270..aa4fa43 100644
--- a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml
+++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectDetailList" resultType="DmsBillsMaintDetailVo"
+    <select id="selectDetailList" resultType="org.dromara.dms.domain.DmsBillsMaintDetail"
             parameterType="java.lang.Long">
         select * from dms_bills_maint_detail where maint_instance_id = #{maintInstanceId}
     </select>
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from dms_base_maint_station where maint_station_id = #{stationId}
     </select>
 
-    <select id="selectPrjectIds" resultType="org.dromara.dms.domain.vo.DmsBaseMaintProjectVo">
+    <select id="selectPrjectIds" resultType="org.dromara.dms.domain.DmsBaseMaintProject">
         SELECT x.maint_project_id,a.maint_project_name,a.maint_project_desc
         FROM dms_base_station_project x
             left join dms_base_maint_project a on x.maint_project_id = a.maint_project_id