physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-02-23 12:49:31 +08:00
parent 16a11e0af0
commit bab50202aa
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java
View File

@@ -100,7 +100,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -138,7 +138,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -176,7 +176,7 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();

6
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java
View File

@@ -96,7 +96,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentRadiationProcess.setId(null);
@@ -136,7 +136,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -174,7 +174,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();

6
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java
View File

@@ -95,7 +95,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentTestProcess.setId(null);
@@ -135,7 +135,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
@@ -175,7 +175,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();

8
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java
View File

@@ -91,7 +91,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentUserService.save(experimentUser);
@@ -120,7 +120,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentUserService.save(v);
@@ -157,7 +157,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
@@ -191,7 +191,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();