From 3472b68d306930629b425a51d305441727890c4d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 11 七月 2025 10:31:08 +0800
Subject: [PATCH] 系统参数配置
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 73d7efd..356394f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -209,27 +209,19 @@
entity.setMaintenancePeriod(standardRequest.getMaintenancePeriod());
eamMaintenanceStandardMapper.updateById(entity);
//澶勭悊璇︽儏
- if (CollectionUtil.isNotEmpty(standardRequest.getTableDetailList())) {
+ if(CollectionUtil.isNotEmpty(standardRequest.getTableDetailList())) {
List<EamMaintenanceStandardDetail> addList = new ArrayList<>();
- List<EamMaintenanceStandardDetail> updateList = new ArrayList<>();
+ //鍏堝垹闄ゅ師鏈�
+ LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardRequest.getId());
+ eamMaintenanceStandardDetailService.remove(queryWrapper);
standardRequest.getTableDetailList().forEach(tableDetail -> {
- tableDetail.setStandardId(entity.getId());
- if (tableDetail.getId() == null) {
- addList.add(tableDetail);
- } else {
- updateList.add(tableDetail);
- }
+ EamMaintenanceStandardDetail eamMaintenanceStandardDetail=new EamMaintenanceStandardDetail();
+ BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
+ eamMaintenanceStandardDetail.setStandardId(entity.getId());
+ addList.add(eamMaintenanceStandardDetail);
});
- if (CollectionUtil.isNotEmpty(addList)) {
- eamMaintenanceStandardDetailService.saveBatch(addList);
- }
- if (CollectionUtil.isNotEmpty(updateList)) {
- eamMaintenanceStandardDetailService.updateBatchById(updateList);
- }
- }
- if (CollectionUtil.isNotEmpty(standardRequest.getRemoveDetailList())) {
- List<String> ids = standardRequest.getRemoveDetailList().stream().map(EamMaintenanceStandardDetail::getId).collect(Collectors.toList());
- eamMaintenanceStandardDetailService.removeBatchByIds(ids);
+ eamMaintenanceStandardDetailService.saveBatch(addList);
}
return true;
}
@@ -1176,7 +1168,6 @@
// 鍒涘缓淇濆吇椤圭洰
EamMaintenanceStandardDetail item = new EamMaintenanceStandardDetail();
- item.setItemCategory("THIRD_MAINTENANCE");
item.setStandardId(standardId);
int colCount = row.getTableCells().size();
--
Gitblit v1.9.3