From 1a89a2eca92540f2a6e9ed5c140b00610f2f4bfc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 14:11:50 +0800
Subject: [PATCH] yys 1.设备巡检，保养加入年维度
---
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 103 +++++++++++++++++++++++++++------------------------
1 files changed, 55 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 9d4c6b3..f0606eb 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -20,7 +20,6 @@
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
-import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +33,6 @@
import java.util.List;
@Service
-@AllArgsConstructor
@Slf4j
public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, DeviceRepair> implements IDeviceRepairService {
@@ -51,43 +49,37 @@
@Override
public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
-
return deviceRepairMapper.queryPage(page, deviceRepairDto);
}
@Override
public AjaxResult saveDeviceRepair(DeviceRepair deviceRepair) {
- DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
- deviceRepair.setDeviceName(byId.getDeviceName());
- deviceRepair.setDeviceModel(byId.getDeviceModel());
- boolean save = this.save(deviceRepair);
- if (save){
- return AjaxResult.success();
+ List<DeviceRepair> records = buildRepairRecords(deviceRepair);
+ if (records.isEmpty()) {
+ return AjaxResult.error("璇烽�夋嫨璁惧");
}
- return AjaxResult.error();
+ return this.saveBatch(records) ? AjaxResult.success() : AjaxResult.error();
}
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateDeviceRepair(DeviceRepair deviceRepair) {
DeviceRepair oldDeviceRepair = this.getById(deviceRepair.getId());
- // 澶勭悊澶囦欢浣跨敤鎯呭喌
+ if (oldDeviceRepair == null) {
+ return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
+ }
if (CollectionUtils.isNotEmpty(deviceRepair.getSparePartsUseList())) {
List<Long> sparePartIds = new ArrayList<>();
for (DeviceRepair.SparePartUse sparePartUse : deviceRepair.getSparePartsUseList()) {
- // 鑾峰彇澶囦欢淇℃伅
SpareParts spareParts = sparePartsMapper.selectById(sparePartUse.getId());
if (spareParts != null) {
- // 妫�鏌ユ暟閲忔槸鍚﹁冻澶�
if (spareParts.getQuantity().compareTo(new BigDecimal(sparePartUse.getQuantity())) >= 0) {
- // 鏇存柊鏁伴噺
spareParts.setQuantity(spareParts.getQuantity().subtract(new BigDecimal(sparePartUse.getQuantity())));
sparePartsMapper.updateById(spareParts);
sparePartIds.add(sparePartUse.getId());
- // 鍒涘缓澶囦欢棰嗙敤璁板綍
SparePartsRequisitionRecord record = new SparePartsRequisitionRecord();
- record.setSourceType(0); // 0 缁翠慨
+ record.setSourceType(0);
record.setSourceId(deviceRepair.getId());
record.setDeviceLedgerId(oldDeviceRepair.getDeviceLedgerId());
record.setSparePartsId(sparePartUse.getId());
@@ -98,7 +90,6 @@
}
}
}
- // 鏇存柊澶囦欢IDs瀛楁
if (!sparePartIds.isEmpty()) {
deviceRepair.setSparePartsIds(StringUtils.join(sparePartIds, ","));
}
@@ -106,12 +97,11 @@
if (this.updateById(deviceRepair)) {
Long id = deviceRepair.getId();
- //
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
deviceDefectRecordDto.setDeviceLedgerId(id);
deviceDefectRecordDto.setStatus("涓ラ噸缂洪櫡");
List<DeviceDefectRecordDto> records = deviceDefectRecordService.listPage(new Page<>(1, -1), deviceDefectRecordDto).getRecords();
- if (!records.isEmpty()){
+ if (!records.isEmpty()) {
records.forEach(deviceDefectRecord -> {
deviceDefectRecord.setStatus("姝ｅ父");
deviceDefectRecordService.updateByDDR(deviceDefectRecord);
@@ -124,42 +114,59 @@
@Override
public void export(HttpServletResponse response, Long[] ids) {
+ List<DeviceRepair> supplierManageList;
if (ids == null || ids.length == 0) {
- List<DeviceRepair> supplierManageList = this.list();
- ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
- supplierManageList.stream().forEach(deviceRepair -> {
- DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
- BeanUtils.copyProperties(deviceRepair,deviceRepairExeclDto);
- deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
-
- deviceLedgerExeclDtos.add(deviceRepairExeclDto);
- });
- ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<DeviceRepairExeclDto>(DeviceRepairExeclDto.class);
- util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鎶ヤ慨瀵煎嚭");
- }else {
- ArrayList<Long> arrayList = new ArrayList<>();
- Arrays.stream(ids).map(id -> {
- return arrayList.add( id);
- });
- List<DeviceRepair> supplierManageList = deviceRepairMapper.selectBatchIds(arrayList);
- ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
- supplierManageList.stream().forEach(deviceRepair -> {
- DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
- BeanUtils.copyProperties(deviceRepair,deviceRepairExeclDto);
- deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
-
- deviceLedgerExeclDtos.add(deviceRepairExeclDto);
- });
- ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<DeviceRepairExeclDto>(DeviceRepairExeclDto.class);
- util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鎶ヤ慨瀵煎嚭");
+ supplierManageList = this.list();
+ } else {
+ supplierManageList = deviceRepairMapper.selectBatchIds(Arrays.asList(ids));
}
-
+ ArrayList<DeviceRepairExeclDto> result = new ArrayList<>();
+ supplierManageList.forEach(deviceRepair -> {
+ DeviceRepairExeclDto dto = new DeviceRepairExeclDto();
+ BeanUtils.copyProperties(deviceRepair, dto);
+ dto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
+ result.add(dto);
+ });
+ ExcelUtil<DeviceRepairExeclDto> util = new ExcelUtil<>(DeviceRepairExeclDto.class);
+ util.exportExcel(response, result, "璁惧鎶ヤ慨瀵煎嚭");
}
@Override
public DeviceRepairDto detailById(Long id) {
-
return deviceRepairMapper.detailById(id);
}
+ private List<DeviceRepair> buildRepairRecords(DeviceRepair source) {
+ Long[] deviceIds = source.getDeviceLedgerIds();
+ if (deviceIds == null || deviceIds.length == 0) {
+ deviceIds = source.getDeviceLedgerId() == null ? new Long[0] : new Long[]{source.getDeviceLedgerId()};
+ }
+ List<DeviceRepair> records = new ArrayList<>();
+ Arrays.stream(deviceIds).distinct().forEach(deviceId -> {
+ DeviceLedger deviceLedger = deviceLedgerService.getById(deviceId);
+ if (deviceLedger == null) {
+ return;
+ }
+ int quantity = resolveQuantity(deviceLedger);
+ for (int i = 0; i < quantity; i++) {
+ DeviceRepair record = new DeviceRepair();
+ BeanUtils.copyProperties(source, record);
+ record.setId(null);
+ record.setDeviceLedgerIds(null);
+ record.setDeviceLedgerId(deviceLedger.getId());
+ record.setAreaId(deviceLedger.getAreaId());
+ record.setDeviceName(deviceLedger.getDeviceName());
+ record.setDeviceModel(deviceLedger.getDeviceModel());
+ records.add(record);
+ }
+ });
+ return records;
+ }
+
+ private int resolveQuantity(DeviceLedger deviceLedger) {
+ if (deviceLedger == null || deviceLedger.getNumber() == null || deviceLedger.getNumber().compareTo(BigDecimal.ONE) < 0) {
+ return 1;
+ }
+ return Math.max(1, deviceLedger.getNumber().intValue());
+ }
}
--
Gitblit v1.9.3