From e79ed4cc43056b1da0a9b45abbfca02ea3e0ca6a Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Fri, 4 Jul 2025 22:13:46 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentController.java      | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index 185c865..4187c94 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -104,7 +104,8 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @GetMapping(value = "/list")
     //    @PermissionData(pageComponent="experiment/manage/ExperimentList")
     public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,@RequestParam(name = "pageName", defaultValue = "") String pageName,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(name = "pageName", defaultValue = "") String pageName,
                                                    HttpServletRequest req) {
         logger.info("查询页面：{}", pageName);
         // 初始化 Logback
@@ -184,7 +185,8 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
 
     /**
      * 新增和修改试验时 需要校验样例信息和辐照板信息、偏置条件信息、加偏设备信息是否一致。
-     *  检查方法是： 样品信息的ids = 辐照板信息、偏置条件信息、加偏设备信息的样品信息IDs
+     * 检查方法是： 样品信息的ids = 辐照板信息、偏置条件信息、加偏设备信息的样品信息IDs
+     *
      * @param experiment 试验信息
      * @return 错误信息， 如果返回为空，则校验通过。
      */
@@ -257,6 +259,33 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         return Result.OK("暂存成功！");
     }
 
+    @AutoLog(value = "试验管理-修改实验统计")
+    @Operation(summary = "试验管理-修改实验统计",
+            description = "修改实验统计")
+    @RequiresPermissions("database:experiment:edit")
+    @RequestMapping(value = "/editCount", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> editCount(@RequestBody Experiment experiment, HttpServletRequest request) {
+        String username = JwtUtil.getUserNameByToken(request);
+        SysUser userByName = userService.getUserByName(username);
+        // 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
+        if (!ADMIN_NAME.equals(userByName.getUsername())) {
+            Experiment dbExp = experimentService.getById(experiment.getId());
+            if (StringUtils.equals(dbExp.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExp.getStatus(),
+                    ExperimentStatus.REVIEWED)) {
+                return Result.error("试验状态:[" + dbExp.getStatus() + "]不能进行修改！");
+            }
+        }
+
+        experimentService.saveOrUpdate(experiment);
+        ExperimentLog experimentLog = new ExperimentLog();
+        experimentLog.setExperimentId(experiment.getId());
+        experimentLog.setLogContent("修改实验统计");
+        experimentLog.setCreateBy(userByName.getRealname());
+        experimentLogService.save(experimentLog);
+        return Result.OK("编辑成功!");
+
+    }
+
     /**
      * 编辑
      *
@@ -356,7 +385,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
             return Result.error("试验数据不存在！");
         }
         Experiment dbData = experimentService.getById(experiment.getId());
-        if (StringUtils.equals(dbData.getStatus(), ExperimentStatus.COMPLETED) ) {
+        if (StringUtils.equals(dbData.getStatus(), ExperimentStatus.COMPLETED)) {
             return Result.error("试验状态:[" + dbData.getStatus() + "]不能进行修改！");
         }
         experimentService.changeStatus(experiment.getId(), ExperimentStatus.COMPLETED);