From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index ce4accd..e8405b4 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -5,18 +5,22 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.device.dto.DeviceLedgerExeclDto;
+import com.ruoyi.device.dto.DeviceLedgerDto;
+import com.ruoyi.device.execl.DeviceLedgerExeclDto;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
@Service
@@ -26,9 +30,11 @@
@Autowired
private DeviceLedgerMapper deviceLedgerMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
@Override
- public IPage<DeviceLedger> queryPage(Page page, DeviceLedger deviceLedger) {
+ public IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger) {
return deviceLedgerMapper.queryPage(page, deviceLedger);
}
@@ -51,15 +57,41 @@
}
@Override
- public void export(HttpServletResponse response, ArrayList<Long> ids) {
- List<DeviceLedger> supplierManageList = deviceLedgerMapper.selectBatchIds(ids);
- ArrayList<DeviceLedgerExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
- supplierManageList.stream().forEach(deviceLedger -> {
- DeviceLedgerExeclDto deviceLedgerExeclDto = new DeviceLedgerExeclDto();
- BeanUtils.copyProperties(deviceLedger,deviceLedgerExeclDto);
- deviceLedgerExeclDtos.add(deviceLedgerExeclDto);
- });
- ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<DeviceLedgerExeclDto>(DeviceLedgerExeclDto.class);
- util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鍙拌处瀵煎嚭");
+ public void export(HttpServletResponse response, Long[] ids) {
+
+ if (ids == null || ids.length == 0) {
+ List<DeviceLedger> supplierManageList = this.list();
+
+ ArrayList<DeviceLedgerExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
+ supplierManageList.stream().forEach(deviceLedger -> {
+ DeviceLedgerExeclDto deviceLedgerExeclDto = new DeviceLedgerExeclDto();
+ BeanUtils.copyProperties(deviceLedger,deviceLedgerExeclDto);
+ deviceLedgerExeclDto.setCreateUser(sysUserMapper.selectUserById(Long.valueOf(deviceLedger.getCreateUser().toString())).getUserName());
+ deviceLedgerExeclDtos.add(deviceLedgerExeclDto);
+ });
+ ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<DeviceLedgerExeclDto>(DeviceLedgerExeclDto.class);
+ util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鍙拌处瀵煎嚭");
+ }else {
+ ArrayList<Long> arrayList = new ArrayList<>();
+ Arrays.stream(ids).map(id -> {
+ return arrayList.add( id);
+ });
+ List<DeviceLedger> supplierManageList = deviceLedgerMapper.selectBatchIds(arrayList);
+ ArrayList<DeviceLedgerExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
+ supplierManageList.stream().forEach(deviceLedger -> {
+ DeviceLedgerExeclDto deviceLedgerExeclDto = new DeviceLedgerExeclDto();
+ BeanUtils.copyProperties(deviceLedger,deviceLedgerExeclDto);
+ deviceLedgerExeclDto.setCreateUser(sysUserMapper.selectUserById(Long.valueOf(deviceLedger.getCreateUser().toString())).getUserName());
+ deviceLedgerExeclDtos.add(deviceLedgerExeclDto);
+ });
+ ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<DeviceLedgerExeclDto>(DeviceLedgerExeclDto.class);
+ util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鍙拌处瀵煎嚭");
+ }
+
+ }
+
+ @Override
+ public Boolean importData(MultipartFile file) {
+ return null;
}
}
--
Gitblit v1.9.3