From c4117e83029610beb9d9ff113493f7c2da2ea027 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 02 三月 2026 09:09:14 +0800
Subject: [PATCH] feat(quality): 设备维修领用备件
---
src/main/java/com/ruoyi/measuringinstrumentledger/service/SparePartsService.java | 2
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 67 +++++++++++++++++++---
src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml | 5 +
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 7 ++
src/main/resources/mapper/device/DeviceRepairMapper.xml | 3
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 4 +
src/main/java/com/ruoyi/measuringinstrumentledger/mapper/SparePartsMapper.java | 4 +
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 4 +
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java | 6 ++
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 50 +++++++++++++++-
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java | 10 ++-
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 3 +
12 files changed, 148 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index 522a324..b8a7b5c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -66,4 +66,11 @@
@ApiModelProperty("鍒涘缓浜哄悕绉�")
private String createUserName;
+
+
+ @ApiModelProperty("棰嗙敤澶囦欢ids")
+ private String sparePartsIds;
+
+
+ private String sparePartsNames;
}
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 92cfe8c..e200740 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -69,6 +69,10 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("棰嗙敤澶囦欢ids")
+ private String sparePartsIds;
+
+ private String sparePartsNames;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index a9368b0..af5a25b 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -84,4 +84,7 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty("棰嗙敤澶囦欢ids")
+ private String sparePartsIds;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index a567366..130f0df 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -73,4 +73,8 @@
private Long tenantId;
+ @ApiModelProperty("棰嗙敤澶囦欢ids")
+ private String sparePartsIds;
+
+
}
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 4370b51..a941d13 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -4,26 +4,34 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
+import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
+import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
public class DeviceMaintenanceServiceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements IDeviceMaintenanceService {
+ @Autowired
+ private SparePartsMapper sparePartsMapper;
@Autowired
private DeviceMaintenanceMapper deviceMaintenanceMapper;
@@ -31,7 +39,43 @@
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
- return deviceMaintenanceMapper.queryPage(page, deviceMaintenanceDto);
+ IPage<DeviceMaintenanceDto> deviceMaintenanceDtoIPage = deviceMaintenanceMapper.queryPage(page, deviceMaintenanceDto);
+ List<DeviceMaintenanceDto> records = deviceMaintenanceDtoIPage.getRecords();
+ if (!CollectionUtils.isEmpty(records)) {
+ // 1. 鑾峰彇鎵�鏈夊敮涓�鐨勫浠禝D
+ Set<String> allIds = records.stream()
+ .map(DeviceMaintenanceDto::getSparePartsIds)
+ .filter(StrUtil::isNotBlank)
+ .flatMap(ids -> Arrays.stream(StringUtils.split(ids, ",")))
+ .map(String::trim)
+ .filter(StrUtil::isNotBlank)
+ .collect(Collectors.toSet());
+
+ if (!allIds.isEmpty()) {
+ // 2. 鏌ヨ骞跺垱寤篒D鍒板悕绉扮殑鏄犲皠
+ Map<Long, String> idToNameMap = sparePartsMapper.selectBatchIds(new ArrayList<>(allIds))
+ .stream()
+ .collect(Collectors.toMap(
+ SpareParts::getId,
+ SpareParts::getName,
+ (v1, v2) -> v1
+ ));
+
+ // 3. 涓烘瘡涓褰曡缃浠跺悕绉�
+ records.forEach(record -> {
+ String names = Optional.ofNullable(record.getSparePartsIds())
+ .filter(StrUtil::isNotBlank)
+ .map(ids -> Arrays.stream(StringUtils.split(ids, ","))
+ .map(String::trim)
+ .map(idToNameMap::get)
+ .filter(Objects::nonNull)
+ .collect(Collectors.joining(",")))
+ .orElse("");
+ record.setSparePartsNames(names);
+ });
+ }
+ }
+ return deviceMaintenanceDtoIPage;
}
@Override
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 ffdedbf..0293956 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -1,8 +1,11 @@
package com.ruoyi.device.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
+import com.google.common.collect.Lists;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
@@ -15,15 +18,20 @@
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
+import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
+import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
@AllArgsConstructor
@@ -36,10 +44,51 @@
private DeviceRepairMapper deviceRepairMapper;
@Autowired
private IDeviceLedgerService deviceLedgerService;
+ @Autowired
+ private SparePartsMapper sparePartsMapper;
+
@Override
public IPage<DeviceRepairDto> queryPage(Page page, DeviceRepairDto deviceRepairDto) {
+ IPage<DeviceRepairDto> deviceRepairDtoIPage = deviceRepairMapper.queryPage(page, deviceRepairDto);
- return deviceRepairMapper.queryPage(page, deviceRepairDto);
+ List<DeviceRepairDto> records = deviceRepairDtoIPage.getRecords();
+ if (!CollectionUtils.isEmpty(records)) {
+ // 1. 鑾峰彇鎵�鏈夊敮涓�鐨勫浠禝D
+ Set<String> allIds = records.stream()
+ .map(DeviceRepairDto::getSparePartsIds)
+ .filter(StrUtil::isNotBlank)
+ .flatMap(ids -> Arrays.stream(StringUtils.split(ids, ",")))
+ .map(String::trim)
+ .filter(StrUtil::isNotBlank)
+ .collect(Collectors.toSet());
+
+ if (!allIds.isEmpty()) {
+ // 2. 鏌ヨ骞跺垱寤篒D鍒板悕绉扮殑鏄犲皠
+ Map<Long, String> idToNameMap = sparePartsMapper.selectBatchIds(new ArrayList<>(allIds))
+ .stream()
+ .collect(Collectors.toMap(
+ SpareParts::getId,
+ SpareParts::getName,
+ (v1, v2) -> v1
+ ));
+
+ // 3. 涓烘瘡涓褰曡缃浠跺悕绉�
+ records.forEach(record -> {
+ String names = Optional.ofNullable(record.getSparePartsIds())
+ .filter(StrUtil::isNotBlank)
+ .map(ids -> Arrays.stream(StringUtils.split(ids, ","))
+ .map(String::trim)
+ .map(Long::valueOf)
+ .map(idToNameMap::get)
+ .filter(Objects::nonNull)
+ .collect(Collectors.joining(",")))
+ .orElse("");
+ record.setSparePartsNames(names);
+ });
+ }
+ }
+
+ return deviceRepairDtoIPage;
}
@Override
@@ -48,7 +97,7 @@
deviceRepair.setDeviceName(byId.getDeviceName());
deviceRepair.setDeviceModel(byId.getDeviceModel());
boolean save = this.save(deviceRepair);
- if (save){
+ if (save) {
return AjaxResult.success();
}
return AjaxResult.error();
@@ -63,7 +112,7 @@
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);
@@ -81,21 +130,21 @@
ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
supplierManageList.stream().forEach(deviceRepair -> {
DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
- BeanUtils.copyProperties(deviceRepair,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 {
+ } else {
ArrayList<Long> arrayList = new ArrayList<>();
Arrays.stream(ids).map(arrayList::add);
List<DeviceRepair> supplierManageList = deviceRepairMapper.selectBatchIds(arrayList);
ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
supplierManageList.stream().forEach(deviceRepair -> {
DeviceRepairExeclDto deviceRepairExeclDto = new DeviceRepairExeclDto();
- BeanUtils.copyProperties(deviceRepair,deviceRepairExeclDto);
+ BeanUtils.copyProperties(deviceRepair, deviceRepairExeclDto);
deviceRepairExeclDto.setStatusStr(deviceRepair.getStatus() == 0 ? "寰呯淮淇�" : deviceRepair.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
deviceLedgerExeclDtos.add(deviceRepairExeclDto);
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
index 599c116..b29af9e 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
@@ -58,4 +58,10 @@
return AjaxResult.success(sparePartsService.removeById(id));
}
+
+ @GetMapping("getByIdDeviceId")
+ @ApiOperation("澶囦欢鍒嗙被-鏌ヨ")
+ public AjaxResult getByDeviceId(Long deviceLedgerId){
+ return AjaxResult.success(sparePartsService.getByDeviceId(deviceLedgerId));
+ }
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/mapper/SparePartsMapper.java b/src/main/java/com/ruoyi/measuringinstrumentledger/mapper/SparePartsMapper.java
index fa52570..c27950d 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/mapper/SparePartsMapper.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/mapper/SparePartsMapper.java
@@ -8,7 +8,11 @@
import io.lettuce.core.dynamic.annotation.Param;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
@Mapper
public interface SparePartsMapper extends BaseMapper<SpareParts> {
IPage<SparePartsDto> listPage(Page page,@Param("spareParts") SpareParts spareParts);
+
+ List<SparePartsDto> getByDeviceId(@Param("id") Long id);
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/service/SparePartsService.java b/src/main/java/com/ruoyi/measuringinstrumentledger/service/SparePartsService.java
index 6185db4..8b700e4 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/SparePartsService.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/SparePartsService.java
@@ -13,4 +13,6 @@
IPage<SparePartsDto> listPage(Page page, SpareParts spareParts);
List<SparePartsDto> getTree();
+
+ List<SparePartsDto> getByDeviceId(Long id);
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
index 5f329e8..bb5952c 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/SparePartsServiceImpl.java
@@ -15,10 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -52,6 +49,11 @@
return buildTree(records);
}
+ @Override
+ public List<SparePartsDto> getByDeviceId(Long id) {
+ return sparePartsMapper.getByDeviceId(id);
+ }
+
/**
* 灏嗘墎骞崇粨鏋勬暟鎹浆鎹负鏍戝舰缁撴瀯
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index d093980..76f48f3 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -21,7 +21,8 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ dr.spare_parts_ids
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
diff --git a/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
index 611d51e..9784603 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml
@@ -11,4 +11,9 @@
</if>
</where>
</select>
+ <select id="getByDeviceId" resultType="com.ruoyi.measuringinstrumentledger.dto.SparePartsDto">
+ SELECT * FROM spare_parts
+ WHERE status = '姝ｅ父'
+ AND FIND_IN_SET(#{id}, device_ids) > 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3