From c0efb2e8358f4e7ee0774c340afd453c3d0c2471 Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期二, 10 六月 2025 17:19:03 +0800 Subject: [PATCH] 1.待入库煤质维护入正式库 2.电子档案tree --- basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 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 3f406b0..fdf4c45 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,6 +67,23 @@ public int addOrEditSupply(SupplyDto supplyDto) { Supply supply = new Supply(); BeanUtils.copyProperties(supplyDto, supply); + if (supplyDto.getBids().size() != 3) { + throw new RuntimeException("璇烽�夋嫨缁忚惀鍦板潃鐪佸競鍖�"); + } + + if (supplyDto.getCids().size() != 3) { + throw new RuntimeException("璇烽�夋嫨鑱旂郴鍦板潃鐪佸競鍖�"); + } + + 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())) { return supplyMapper.insert(supply); } else { @@ -87,6 +106,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