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+=`
- |
- |
- ${ele.startDate} |
- ${ele.endDate} |
- ${ele.status == 0 ? '有效' : '无效'} |
+ ${ele.serviceLevel} |
+ ${ele.serviceDescribe} |
+ ${ele.serviceStartTime} |
+ ${ele.serviceEndTime} |
+ 有效 |
`
})
}
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 query(MaintenanceRecordsDto dto);
+ List 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 query(MaintenanceRecordsDto dto) {
- return mapper.query(dto);
+ public List query(MaintenanceRecordsDto dto) {
+
+ ApiDataQueryDto apiDataQueryDto = new ApiDataQueryDto();
+ apiDataQueryDto.setSerialNumber(dto.getSerialNumber());
+ List 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 #{queryEndTime}
+
+ and t1.serial_number = #{serialNumber}
+