From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
index be0cc29..74e88ec 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
@@ -4,34 +4,33 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.mapper.GasTankWarningMapper;
import com.ruoyi.procurementrecord.pojo.GasTankWarning;
import com.ruoyi.procurementrecord.service.GasTankWarningService;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@Service
+@RequiredArgsConstructor
public class GasTankWarningServiceImpl extends ServiceImpl<GasTankWarningMapper, GasTankWarning> implements GasTankWarningService {
- @Autowired
- private GasTankWarningMapper gasTankWarningMapper;
+ private final GasTankWarningMapper gasTankWarningMapper;
+
@Override
public IPage listPage(Page page, GasTankWarning gasTankWarning) {
- return gasTankWarningMapper.listPage(page,gasTankWarning);
+ return gasTankWarningMapper.listPage(page, gasTankWarning);
}
@Override
public void export(HttpServletResponse response, List<Long> ids) {
List<GasTankWarning> list = new ArrayList<>();
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
list = gasTankWarningMapper.selectList(null);
- }else {
+ } else {
list = gasTankWarningMapper.selectBatchIds(ids);
}
ExcelUtil<GasTankWarning> util = new ExcelUtil<>(GasTankWarning.class);
--
Gitblit v1.9.3