Merge remote-tracking branch 'origin/main'

project/src/main/java/com/sdm/project/controller/SimulationRunController.java

@@ -130,6 +130,12 @@ public class SimulationRunController implements ISimulationRunFeignClient {
         return runService.addSimulationKeyResult(req);
     }
 
+    @SysLog("编辑算例关键结果属性")
+    @PostMapping(value = "/editSimulationKeyResult")
+    public SdmResponse editSimulationKeyResult(@RequestBody KeyResultReq req) {
+        return runService.editSimulationKeyResult(req);
+    }
+
     /**
      * 上传交付物-第一步 文件信息和关键结果信息批量入库
      *

project/src/main/java/com/sdm/project/model/req/KeyResultReq.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 @Data
 public class KeyResultReq extends BaseReq {
+    private Long id;
 
     private String uuid;
 

project/src/main/java/com/sdm/project/service/ISimulationRunService.java

@@ -50,6 +50,8 @@ public interface ISimulationRunService extends IService<SimulationRun> {
 
     SdmResponse addSimulationKeyResult(KeyResultReq req);
 
+    SdmResponse editSimulationKeyResult(KeyResultReq req);
+
     SdmResponse<List<BatchAddFileInfoResp>> batchAddSimulationKeyResult(KeyResultReq req);
 
     SdmResponse deliverableApprove(DeliverableApproveReq req);

project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java

@@ -782,6 +782,17 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
         return SdmResponse.success(simulationRunKeyResult.getUuid());
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public SdmResponse editSimulationKeyResult(KeyResultReq req) {
+        SimulationRunKeyResult simulationRunKeyResult = new SimulationRunKeyResult();
+        BeanUtils.copyProperties(req, simulationRunKeyResult);
+        if (!simulationKeyResultService.updateById(simulationRunKeyResult)) {
+            return SdmResponse.failed("更新关键结果失败");
+        }
+        return SdmResponse.success();
+    }
+
     /**
      * 保存上传的文件到临时目录
      */