From 2359f47c2f89a9867e72aa9b171cb118b874afec Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 三月 2026 10:29:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatemaintenanceServiceImpl.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 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 78e0788..8949968 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
@@ -1,15 +1,15 @@
package com.ruoyi.project.service.impl;
+import com.alibaba.fastjson.JSONObject;
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.entity.ServiceDonatemaintenanceEntity;
import com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO;
-import com.ruoyi.project.domain.dto.ServiceDonatebaseinfoDTO;
+import com.ruoyi.project.domain.entity.MaintenanceBaseInfoEntity;
import com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO;
import com.ruoyi.project.mapper.ServiceDonatemaintenanceMapper;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
@@ -17,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -26,7 +27,7 @@
* @date 2025-12-27
*/
@Service
-public class ServiceDonatemaintenanceServiceImpl extends ServiceImpl<ServiceDonatemaintenanceMapper, ServiceDonatemaintenance> implements IServiceDonatemaintenanceService {
+public class ServiceDonatemaintenanceServiceImpl extends ServiceImpl<ServiceDonatemaintenanceMapper, ServiceDonatemaintenanceEntity> implements IServiceDonatemaintenanceService {
@Autowired
private ServiceDonatemaintenanceMapper serviceDonatemaintenanceMapper;
@@ -40,42 +41,50 @@
* @return 渚涗綋缁存姢璁板綍
*/
@Override
- public Page<ServiceDonatemaintenance> queryList(ServiceDonatemaintenance serviceDonatemaintenance) {
- LambdaQueryWrapper<ServiceDonatemaintenance> wrappers = Wrappers.lambdaQuery();
+ public Page<ServiceDonatemaintenanceEntity> queryList(ServiceDonatemaintenanceEntity serviceDonatemaintenance) {
+ LambdaQueryWrapper<ServiceDonatemaintenanceEntity> wrappers = Wrappers.lambdaQuery();
if (serviceDonatemaintenance.getInfoid() != null) {
- wrappers.eq(ServiceDonatemaintenance::getInfoid, serviceDonatemaintenance.getInfoid());
+ wrappers.eq(ServiceDonatemaintenanceEntity::getInfoid, serviceDonatemaintenance.getInfoid());
}
if (StringUtils.isNotBlank(serviceDonatemaintenance.getCaseNo())) {
- wrappers.eq(ServiceDonatemaintenance::getCaseNo, serviceDonatemaintenance.getCaseNo());
+ wrappers.eq(ServiceDonatemaintenanceEntity::getCaseNo, serviceDonatemaintenance.getCaseNo());
}
if (StringUtils.isNotBlank(serviceDonatemaintenance.getDonorno())) {
- wrappers.eq(ServiceDonatemaintenance::getDonorno, serviceDonatemaintenance.getDonorno());
+ wrappers.eq(ServiceDonatemaintenanceEntity::getDonorno, serviceDonatemaintenance.getDonorno());
}
if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemNo())) {
- wrappers.eq(ServiceDonatemaintenance::getItemNo, serviceDonatemaintenance.getItemNo());
+ wrappers.eq(ServiceDonatemaintenanceEntity::getItemNo, serviceDonatemaintenance.getItemNo());
}
if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemName())) {
- wrappers.like(ServiceDonatemaintenance::getItemName, serviceDonatemaintenance.getItemName());
+ wrappers.like(ServiceDonatemaintenanceEntity::getItemName, serviceDonatemaintenance.getItemName());
}
if (serviceDonatemaintenance.getItemTime() != null) {
- wrappers.eq(ServiceDonatemaintenance::getItemTime, serviceDonatemaintenance.getItemTime());
+ wrappers.eq(ServiceDonatemaintenanceEntity::getItemTime, serviceDonatemaintenance.getItemTime());
}
if (StringUtils.isNotBlank(serviceDonatemaintenance.getItemDesc())) {
- wrappers.eq(ServiceDonatemaintenance::getItemDesc, serviceDonatemaintenance.getItemDesc());
+ wrappers.eq(ServiceDonatemaintenanceEntity::getItemDesc, serviceDonatemaintenance.getItemDesc());
}
// 鍒涘缓鍒嗛〉瀵硅薄锛岃缃〉鐮佸拰姣忛〉澶у皬
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);
+ Page<ServiceDonatemaintenanceEntity> page = new Page<>(currentPage, size);
- List<ServiceDonatemaintenance> serviceDonatemaintenanceList = serviceDonatemaintenanceMapper.selectPage(page, wrappers).getRecords();
+ List<ServiceDonatemaintenanceEntity> serviceDonatemaintenanceList = serviceDonatemaintenanceMapper.selectPage(page, wrappers).getRecords();
return page.setRecords(serviceDonatemaintenanceList);
}
@Override
public List<MaintenanceBaseInfoDTO> maintenanceBaseInfoList(MaintenanceBaseInfoVO maintenanceBaseInfoVO) {
- List<MaintenanceBaseInfoDTO> maintenanceBaseInfoDTOS = serviceDonatemaintenanceMapper.selectServiceDonatemaintenanceList(maintenanceBaseInfoVO);
+ List<MaintenanceBaseInfoEntity> maintenanceBaseInfoEntityList = serviceDonatemaintenanceMapper.selectServiceDonatemaintenanceList(maintenanceBaseInfoVO);
+ List<MaintenanceBaseInfoDTO> maintenanceBaseInfoDTOS = new ArrayList<>();
+ for (MaintenanceBaseInfoEntity maintenanceBaseInfoEntity : maintenanceBaseInfoEntityList) {
+ MaintenanceBaseInfoDTO maintenanceBaseInfoDTO = DtoConversionUtils.sourceToTarget(maintenanceBaseInfoEntity, MaintenanceBaseInfoDTO.class);
+ if (maintenanceBaseInfoEntity.getItemDesc() != null) {
+ maintenanceBaseInfoDTO.setItemDesc(JSONObject.parseObject(maintenanceBaseInfoEntity.getItemDesc()));
+ }
+ maintenanceBaseInfoDTOS.add(maintenanceBaseInfoDTO);
+ }
return maintenanceBaseInfoDTOS;
}
--
Gitblit v1.9.3