From bd735893d1eb510d170fea899b909f46189e8b46 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 17:05:09 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanMaterialServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanMaterialServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanMaterialServiceImpl.java
index a64b03f..04af13c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanMaterialServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanMaterialServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.inspect.dto.ReliabilityPlanMaterialDto;
import com.ruoyi.inspect.pojo.ReliabilityPlanMaterial;
import com.ruoyi.inspect.mapper.ReliabilityPlanMaterialMapper;
@@ -36,12 +35,13 @@
@Override
public int addOrUpdateMaterial(ReliabilityPlanMaterialDto reliabilityPlanMaterialDto) {
if (Objects.isNull(reliabilityPlanMaterialDto.getId())) {
- reliabilityPlanMaterialDto.setState(null);
+ reliabilityPlanMaterialDto.setState(0);
return reliabilityPlanMaterialMapper.insert(reliabilityPlanMaterialDto);
} else {
- //1宸插鏍�
- if (!StringUtils.isNotBlank(reliabilityPlanMaterialDto.getState())) {
- reliabilityPlanMaterialDto.setState(null);
+ // 瀹℃牳鐘舵�� 0.寰呮彁浜�1.寰呭鏍�2.閫氳繃3.涓嶉�氳繃
+ int state = reliabilityPlanMaterialDto.getState();
+ if (state != 0 && state != 1 && state != 2) {
+ reliabilityPlanMaterialDto.setState(3);
}
return reliabilityPlanMaterialMapper.updateById(reliabilityPlanMaterialDto);
--
Gitblit v1.9.3