From e20f2bbad49f19c957841dd28f96d0ef7d7d41f1 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Wed, 21 May 2025 17:01:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E9=87=8D=E6=9E=84=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ApiDataQueryDto 中添加 serialNumber 字段
- 在 DeliveryListMapper.xml 中添加 serialNumber 的查询条件
- 修改 IMaintenanceService 接口，返回类型变更为 List<DeliveryInfoVo.ServiceInfo>
- 重构 MaintenanceServiceImpl 中的 query 方法，使用 DeliveryListService 获取数据
- 更新前端模板，显示新的服务信息字段
---
 .../templates/manage/service/service.html     | 10 +++++-----
 .../com/ruoyi/sip/dto/ApiDataQueryDto.java    |  1 +
 .../sip/service/IMaintenanceService.java      |  3 ++-
 .../service/impl/MaintenanceServiceImpl.java  | 19 +++++++++++++++++--
 .../mapper/manage/DeliveryListMapper.xml      |  3 +++
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/manage/service/service.html b/ruoyi-admin/src/main/resources/templates/manage/service/service.html
index db42353f..30cc920a 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/service/service.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/service/service.html
@@ -209,11 +209,11 @@
                 str=``
                 res.data.forEach((ele)=>{
                     str+=`<tr>
-                            <td></td>
-                            <td></td>
-                            <td>${ele.startDate}</td>
-                            <td>${ele.endDate}</td>
-                            <td>${ele.status == 0 ? '有效' : '无效'}</td>
+                            <td>${ele.serviceLevel}</td>
+                            <td>${ele.serviceDescribe}</td>
+                            <td>${ele.serviceStartTime}</td>
+                            <td>${ele.serviceEndTime}</td>
+                            <td>有效</td>
                            </tr>`
                 })
             }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/ApiDataQueryDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/ApiDataQueryDto.java
index 6fc8bab8..7f4233af 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/ApiDataQueryDto.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/dto/ApiDataQueryDto.java
@@ -28,5 +28,6 @@ public class ApiDataQueryDto {
     @NotNull(message = "查询结束时间不能为空")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date queryEndTime;
+    private String serialNumber;
 
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java
index b49e68c4..fe1282a0 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java
@@ -2,9 +2,10 @@ package com.ruoyi.sip.service;
 
 import com.ruoyi.sip.domain.MaintenanceRecord;
 import com.ruoyi.sip.domain.MaintenanceRecordsDto;
+import com.ruoyi.sip.vo.DeliveryInfoVo;
 
 import java.util.List;
 
 public interface IMaintenanceService {
-    List<MaintenanceRecord> query(MaintenanceRecordsDto dto);
+    List<DeliveryInfoVo.ServiceInfo> query(MaintenanceRecordsDto dto);
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java
index a3c89f65..3d7138f4 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java
@@ -1,14 +1,20 @@
 package com.ruoyi.sip.service.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.sip.domain.MaintenanceRecord;
 import com.ruoyi.sip.domain.MaintenanceRecordsDto;
+import com.ruoyi.sip.dto.ApiDataQueryDto;
 import com.ruoyi.sip.mapper.MaintenanceMapper;
+import com.ruoyi.sip.service.IDeliveryListService;
 import com.ruoyi.sip.service.IMaintenanceService;
+import com.ruoyi.sip.vo.DeliveryInfoVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -30,10 +36,19 @@ public class MaintenanceServiceImpl implements IMaintenanceService {
 
     @Resource
     private MaintenanceMapper mapper;
+    @Autowired
+    private IDeliveryListService deliveryListService;
 
 
     @Override
-    public List<MaintenanceRecord> query(MaintenanceRecordsDto dto) {
-        return mapper.query(dto);
+    public List<DeliveryInfoVo.ServiceInfo> query(MaintenanceRecordsDto dto) {
+
+        ApiDataQueryDto apiDataQueryDto = new ApiDataQueryDto();
+        apiDataQueryDto.setSerialNumber(dto.getSerialNumber());
+        List<DeliveryInfoVo> numberInfo = deliveryListService.getNumberInfo(apiDataQueryDto);
+        if (CollUtil.isEmpty(numberInfo)){
+            return Collections.emptyList();
+        }
+        return numberInfo.get(0).getServiceInfo();
     }
 }
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
index 395d880a..555b2191 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
@@ -79,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and t1.updated_at   <![CDATA[ <= ]]>  #{queryEndTime}
                 </when>
             </choose>
+        <if test="serialNumber!=null and serialNumber!=''">
+            and t1.serial_number = #{serialNumber}
+        </if>
         </where>
     </select>