From 6047f24edc72a13b71813c3fb6cc0d087c0f6cd7 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 29 十二月 2025 12:46:35 +0800
Subject: [PATCH] yys 巡检定时任务持久化
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
index 9946698..8b163c0 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
@@ -10,6 +10,8 @@
import com.ruoyi.basic.mapper.SupplyMapper;
import com.ruoyi.basic.service.SupplyService;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -65,21 +67,19 @@
public int addOrEditSupply(SupplyDto supplyDto) {
Supply supply = new Supply();
BeanUtils.copyProperties(supplyDto, supply);
- if (supplyDto.getBids().size() != 3) {
- throw new RuntimeException("璇烽�夋嫨缁忚惀鍦板潃鐪佸競鍖�");
+ if (supplyDto.getBids() != null && supplyDto.getBids().size() == 3) {
+ supply.setBProvinceId(supplyDto.getBids().get(0));
+ supply.setBCityId(supplyDto.getBids().get(1));
+ supply.setBDistrictId(supplyDto.getBids().get(2));
}
- if (supplyDto.getCids().size() != 3) {
- throw new RuntimeException("璇烽�夋嫨鑱旂郴鍦板潃鐪佸競鍖�");
+ if (supplyDto.getCids() != null && supplyDto.getCids().size() == 3) {
+ supply.setCProvinceId(supplyDto.getCids().get(0));
+ supply.setCCityId(supplyDto.getCids().get(1));
+ supply.setCDistrictId(supplyDto.getCids().get(2));
}
- supply.setBProvinceId(supplyDto.getBids().get(0));
- supply.setBCityId(supplyDto.getBids().get(1));
- supply.setBDistrictId(supplyDto.getBids().get(2));
- supply.setCProvinceId(supplyDto.getCids().get(0));
- supply.setCCityId(supplyDto.getCids().get(1));
- supply.setCDistrictId(supplyDto.getCids().get(2));
if (Objects.isNull(supplyDto.getId())) {
@@ -104,6 +104,19 @@
}
@Override
+ public void supplyExport(HttpServletResponse response, SupplyDto supplyDto) {
+ List<Long> ids = supplyDto.getIds();
+ List<Supply> list;
+ if (ids != null && ids.size() > 0) {
+ list = supplyMapper.selectByIds(ids);
+ } else {
+ list = supplyMapper.selectList(null);
+ }
+ ExcelUtil<Supply> util = new ExcelUtil<>(Supply.class);
+ util.exportExcel(response, list, "渚涘簲鍟嗘暟鎹�");
+ }
+
+ @Override
public List<Supply> supplyList() {
return supplyMapper.selectList(null);
}
--
Gitblit v1.9.3