From d88fffd5d757a23f302011ced88dea92e1ce31e9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 一月 2026 13:48:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java
index 23cde40..78e0788 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java
@@ -2,11 +2,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonatemaintenance;
+import com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO;
+import com.ruoyi.project.domain.dto.ServiceDonatebaseinfoDTO;
+import com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO;
import com.ruoyi.project.mapper.ServiceDonatemaintenanceMapper;
+import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonatemaintenanceService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -18,9 +26,12 @@
* @date 2025-12-27
*/
@Service
-public class ServiceDonatemaintenanceServiceImpl extends ServiceImpl<ServiceDonatemaintenanceMapper, ServiceDonatemaintenance> implements IServiceDonatemaintenanceService
-{
+public class ServiceDonatemaintenanceServiceImpl extends ServiceImpl<ServiceDonatemaintenanceMapper, ServiceDonatemaintenance> implements IServiceDonatemaintenanceService {
+ @Autowired
+ private ServiceDonatemaintenanceMapper serviceDonatemaintenanceMapper;
+ @Autowired
+ private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
/**
* 鏌ヨ渚涗綋缁存姢璁板綍鍒楄〃
@@ -29,30 +40,43 @@
* @return 渚涗綋缁存姢璁板綍
*/
@Override
- public List<ServiceDonatemaintenance> queryList(ServiceDonatemaintenance serviceDonatemaintenance) {
+ public Page<ServiceDonatemaintenance> queryList(ServiceDonatemaintenance serviceDonatemaintenance) {
LambdaQueryWrapper<ServiceDonatemaintenance> wrappers = Wrappers.lambdaQuery();
- if (serviceDonatemaintenance.getInfoid() != null){
- wrappers.eq(ServiceDonatemaintenance::getInfoid ,serviceDonatemaintenance.getInfoid());
+ if (serviceDonatemaintenance.getInfoid() != null) {
+ wrappers.eq(ServiceDonatemaintenance::getInfoid, serviceDonatemaintenance.getInfoid());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getCaseNo())){
- wrappers.eq(ServiceDonatemaintenance::getCaseNo ,serviceDonatemaintenance.getCaseNo());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getCaseNo())) {
+ wrappers.eq(ServiceDonatemaintenance::getCaseNo, serviceDonatemaintenance.getCaseNo());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getDonorno())){
- wrappers.eq(ServiceDonatemaintenance::getDonorno ,serviceDonatemaintenance.getDonorno());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getDonorno())) {
+ wrappers.eq(ServiceDonatemaintenance::getDonorno, serviceDonatemaintenance.getDonorno());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemNo())){
- wrappers.eq(ServiceDonatemaintenance::getItemNo ,serviceDonatemaintenance.getItemNo());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemNo())) {
+ wrappers.eq(ServiceDonatemaintenance::getItemNo, serviceDonatemaintenance.getItemNo());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemName())){
- wrappers.like(ServiceDonatemaintenance::getItemName ,serviceDonatemaintenance.getItemName());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemName())) {
+ wrappers.like(ServiceDonatemaintenance::getItemName, serviceDonatemaintenance.getItemName());
}
- if (serviceDonatemaintenance.getItemTime() != null){
- wrappers.eq(ServiceDonatemaintenance::getItemTime ,serviceDonatemaintenance.getItemTime());
+ if (serviceDonatemaintenance.getItemTime() != null) {
+ wrappers.eq(ServiceDonatemaintenance::getItemTime, serviceDonatemaintenance.getItemTime());
}
- if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemDesc())){
- wrappers.eq(ServiceDonatemaintenance::getItemDesc ,serviceDonatemaintenance.getItemDesc());
+ if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemDesc())) {
+ wrappers.eq(ServiceDonatemaintenance::getItemDesc, serviceDonatemaintenance.getItemDesc());
}
- return this.list(wrappers);
+
+ // 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
+ int currentPage = (serviceDonatemaintenance.getPageNum() == null || serviceDonatemaintenance.getPageNum() < 1) ? 1 : serviceDonatemaintenance.getPageNum();
+ int size = (serviceDonatemaintenance.getPageSize() == null || serviceDonatemaintenance.getPageSize() < 1) ? 10 : serviceDonatemaintenance.getPageSize();
+ Page<ServiceDonatemaintenance> page = new Page<>(currentPage, size);
+
+ List<ServiceDonatemaintenance> serviceDonatemaintenanceList = serviceDonatemaintenanceMapper.selectPage(page, wrappers).getRecords();
+ return page.setRecords(serviceDonatemaintenanceList);
+ }
+
+ @Override
+ public List<MaintenanceBaseInfoDTO> maintenanceBaseInfoList(MaintenanceBaseInfoVO maintenanceBaseInfoVO) {
+ List<MaintenanceBaseInfoDTO> maintenanceBaseInfoDTOS = serviceDonatemaintenanceMapper.selectServiceDonatemaintenanceList(maintenanceBaseInfoVO);
+ return maintenanceBaseInfoDTOS;
}
}
--
Gitblit v1.9.3