update

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java

@@ -7,5 +7,5 @@ public interface ExperimentStatus {
     String PROGRESSING = "试验进行中";
     //String REPORT_AUDITING = "报告审批中";
     String COMPLETED   = "试验完成";
-    String REVIEWED    = "已审核";
+    String REVIEWED    = "审核完成";
 }

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

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

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java

@@ -204,7 +204,8 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody Experiment experiment, HttpServletRequest request) {
         Experiment dbExp = experimentService.getById(experiment.getId());
-        if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.COMPLETED)) {
+        if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExp.getStatus(),
+                ExperimentStatus.REVIEWED)) {
             return Result.error("试验状态:[" + dbExp.getStatus() + "]不能进行修改！");
         }
         if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.STAGING)) {
@@ -290,7 +291,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
             return Result.error("试验数据不存在！");
         }
         Experiment dbData = experimentService.getById(experiment.getId());
-
+        if (StringUtils.equals(dbData.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbData.getStatus(),
+                ExperimentStatus.REVIEWED)) {
+            return Result.error("试验状态:[" + dbData.getStatus() + "]不能进行修改！");
+        }
         experimentService.changeStatus(experiment.getId(), ExperimentStatus.COMPLETED);
         LocalDatabase localData = new LocalDatabase();
         localData.setClientName(dbData.getClientName());
@@ -396,6 +400,8 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         if (Objects.isNull(experiment) || StringUtils.isBlank(experiment.getId())) {
             return Result.OK("请选择试验");
         }
+        experiment.setStatus(ExperimentStatus.REVIEWED);
+        experimentService.updateById(experiment);
         return Result.OK("审核完成");
     }
 

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

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

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

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

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/HistoricalDatabase.java

@@ -115,4 +115,24 @@ public class HistoricalDatabase implements Serializable {
     @Excel(name = "理化所统计", width = 15)
     @Schema(description = "理化所统计")
     private Integer totalCountLhs;
+
+    /**
+     * 数据录入者
+     */
+    @Excel(name = "数据录入者", width = 15)
+    @Schema(description = "数据录入者")
+    private String dataProvider;
+
+    /**
+     * 数据录入员
+     */
+    @Excel(name = "数据录入员", width = 15)
+    @Schema(description = "数据录入员")
+    private String dataEntry;
+    /**
+     * 附件
+     */
+    @Excel(name = "附件", width = 15)
+    @Schema(description = "附件")
+    private String fileUrl;
 }