dd0411e2b33635bae66170b4a51612d835a7bfe7..3fc03c12b0c72b90d3531cbf3a4bf11552f8819e
2025-07-11 lyh
系统参数配置
3fc03c 对比 | 目录
2025-07-11 lyh
系统参数配置
3472b6 对比 | 目录
已修改3个文件
34 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamMaintenanceStandardRequest.java
@@ -62,9 +62,6 @@
    /**列表 保养项明细*/
    @ApiModelProperty(value = "列表 保养项明细")
    private List<EamMaintenanceStandardDetail> tableDetailList;
    /**删除 保养项明细*/
    @ApiModelProperty(value = "删除 保养项明细")
    private List<EamMaintenanceStandardDetail> removeDetailList;
    /**
     * Excel导入时使用
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();
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -304,4 +304,4 @@
  url: http://localhost:8081/services/EquipmentService?wsdl
  namespace: http://service.server.webservice.example.com
  statusMethod: equipmentStatus
  rateMethod: equipmentRate
  rateMethod: equipmentRate