Merge remote-tracking branch 'origin/master'

heheng

2025-12-03 430477c7e0777531f22fc18dc8906ea75cdc21d9

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/AnnualMaintenanceServiceImpl.java

@@ -7,6 +7,7 @@
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.constant.UserConstant;
import com.gkhy.exam.common.exception.ApiException;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.system.domain.AnnualMaintenance;
@@ -102,7 +103,7 @@
                            .in(AnnualMaintenanceDevice::getId, delDeviceIds)
            );
            if (update <= 0){
                throw new RuntimeException("删除年度基础设施维护计划设备失败");
                throw new ApiException("删除年度基础设施维护计划设备失败");
            }
        }
        
@@ -115,7 +116,7 @@
                annualMaintenanceDevice.setCreateTime(LocalDateTime.now());
                int insert = annualMaintenanceDeviceMapper.insert(annualMaintenanceDevice);
                if (insert <= 0){
                    throw new RuntimeException("保存年度基础设施维护计划设备失败");
                    throw new ApiException("保存年度基础设施维护计划设备失败");
                }
                
                List<AnnualMaintenanceDeviceType> annualMaintenanceDeviceTypes = annualMaintenanceDeviceSaveDTOReq.getAnnualMaintenanceDeviceTypes();
@@ -126,7 +127,7 @@
                        annualMaintenanceDeviceType.setCreateTime(LocalDateTime.now());
                        int insert1 = annualMaintenanceDeviceTypeMapper.insert(annualMaintenanceDeviceType);
                        if (insert1 <= 0){
                            throw new RuntimeException("保存年度基础设施维护计划设备类型失败");
                            throw new ApiException("保存年度基础设施维护计划设备类型失败");
                        }
                    }
                }
@@ -135,7 +136,7 @@
                annualMaintenanceDevice.setUpdateTime(LocalDateTime.now());
                int update = annualMaintenanceDeviceMapper.updateById(annualMaintenanceDevice);
                if (update <= 0){
                    throw new RuntimeException("更新年度基础设施维护计划设备失败");
                    throw new ApiException("更新年度基础设施维护计划设备失败");
                }
                List<AnnualMaintenanceDeviceType> annualMaintenanceDeviceTypes = annualMaintenanceDeviceSaveDTOReq.getAnnualMaintenanceDeviceTypes();
                if (ObjectUtils.isNotEmpty(annualMaintenanceDeviceTypes)){ 
@@ -146,14 +147,14 @@
                            annualMaintenanceDeviceType.setCreateTime(LocalDateTime.now());
                            int insert1 = annualMaintenanceDeviceTypeMapper.insert(annualMaintenanceDeviceType);
                            if (insert1 <= 0){
                                throw new RuntimeException("保存年度基础设施维护计划设备类型失败");
                                throw new ApiException("保存年度基础设施维护计划设备类型失败");
                            }
                        }else {
                            annualMaintenanceDeviceType.setUpdateBy(SecurityUtils.getUsername());
                            annualMaintenanceDeviceType.setUpdateTime(LocalDateTime.now());
                            int update1 = annualMaintenanceDeviceTypeMapper.updateById(annualMaintenanceDeviceType);
                            if (update1 <= 0){
                                throw new RuntimeException("更新年度基础设施维护计划设备类型失败");
                                throw new ApiException("更新年度基础设施维护计划设备类型失败");
                            }
                        }
                       
@@ -215,11 +216,11 @@
                    annualMaintenanceDeviceType.setUpdateTime(LocalDateTime.now());
                    int update2 = annualMaintenanceDeviceTypeMapper.update(annualMaintenanceDeviceType, new LambdaQueryWrapper<AnnualMaintenanceDeviceType>().in(AnnualMaintenanceDeviceType::getAnnualMaintenanceDeviceId, deviceIds));
                    if (update2 <= 0){
                        throw new RuntimeException("删除数据失败");
                        throw new ApiException("删除数据失败");
                    }
                }
            }else {
                throw new RuntimeException("删除数据失败");
                throw new ApiException("删除数据失败");
            }

            return CommonResult.success();