修改模型评估中的删除功能为物理删除，修改模型评估中的取消备份的功能为将备份数据物理删除

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/modelassesstaskmanual/ManualModelAnswerMapper.java

@@ -30,4 +30,6 @@ public interface ManualModelAnswerMapper extends BaseMapperX<ManualModelAnswerDO
     }
     @Update("update llm_manual_model_answer set status = #{status} where id = #{modelAnswerId}")
     void updateStatus(@Param("modelAnswerId") Long modelAnswerId, @Param("status") int status);
+
+    boolean deleteDataByTaskId(@Param("taskId") Long taskId);
 }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/modelassesstaskmanual/ModelAssessTaskDimensionMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanual.vo.ModelAssessTaskDimensionPageReqVO;
 import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanual.ModelAssessTaskDimensionDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -28,4 +29,6 @@ public interface ModelAssessTaskDimensionMapper extends BaseMapperX<ModelAssessT
                 .orderByDesc(ModelAssessTaskDimensionDO::getId));
     }
 
+    public boolean deleteDataByTaskId(@Param("taskId") Long taskId);
+
 }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/modelassesstaskmanual/ModelAssessTaskManualMapper.java

@@ -31,4 +31,5 @@ public interface ModelAssessTaskManualMapper extends BaseMapperX<ModelAssessTask
 
     @Select("select backup_id from llm_model_assess_task_manual where id = #{id}")
     Long selectTrueById(Long id);
+    boolean deleteByTaskid(@Param("taskId") Long taskId);
 }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/modelassesstaskmanualbackup/ManualModelAnswerBackupMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.
 import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ManualModelAnswerBackupDO;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 模型评估人工标注 模型回答 Mapper
@@ -31,4 +32,6 @@ public interface ManualModelAnswerBackupMapper extends BaseMapperX<ManualModelAn
     }
     @Delete("delete from llm_manual_model_answer_backup where manal_task_id = #{id}")
     void deleteTrue(Long id);
+
+    boolean deleteByTaskid(@Param("taskId")Long taskId);
 }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/modelassesstaskmanualbackup/ModelAssessTaskDimensionBackupMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.
 import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupDO;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 人工打分 评估维度 Mapper
@@ -26,4 +27,6 @@ public interface ModelAssessTaskDimensionBackupMapper extends BaseMapperX<ModelA
     }
     @Delete("delete from llm_model_assess_task_dimension_backup where task_id = #{id}")
     void deleteTrue(Long id);
+
+    boolean deleteByTaskid(@Param("taskId")Long taskId);
 }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/modelassesstaskmanualbackup/ModelAssessTaskManualBackupMapper.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.Mo
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.llm.controller.admin.modelassesstaskmanualbackup.vo.*;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 /**
@@ -34,4 +35,6 @@ public interface ModelAssessTaskManualBackupMapper extends BaseMapperX<ModelAsse
     }
     @Delete("delete from llm_model_assess_task_manual_backup where id = #{id}")
     void deleteTrue(Long id);
+
+    boolean deleteByTaskid(@Param("taskId")Long taskId);
 }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelAccessManualService.java

@@ -45,6 +45,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -292,6 +293,7 @@ public class AsyncModelAccessManualService {
                     ModelAssessTaskDimensionBackupDO bean = BeanUtils.toBean(item, ModelAssessTaskDimensionBackupDO.class);
                     bean.setId(null);
                     bean.setTaskId(backupDo.getId());
+                    bean.setCreateTime(LocalDateTime.now());
                     modelAssessTaskDimensionBackupMapper.insert(bean);
                 });
             }
@@ -302,6 +304,7 @@ public class AsyncModelAccessManualService {
                     ManualModelAnswerBackupDO bean = BeanUtils.toBean(item, ManualModelAnswerBackupDO.class);
                     bean.setId(null);
                     bean.setManalTaskId(backupDo.getId());
+                    bean.setCreateTime(LocalDateTime.now());
                     manualModelAnswerBackupMapper.insert(bean);
                 });
             }

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualServiceImpl.java

@@ -71,6 +71,7 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe
     @Resource
     private ManualModelAnswerMapper manualModelAnswerMapper;
 
+
     @Override
     public Long createModelAssessTaskManual (ModelAssessTaskManualSaveReqVO createReqVO) {
         validateModelAssessTaskManualNameExists(createReqVO);
@@ -126,7 +127,14 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe
         wrapper.eq(ModelAssessTaskManualDO::getId, id);
         wrapper.set(ModelAssessTaskManualDO::getDeleted, true);
         // 删除
-        modelAssessTaskManualMapper.update(null, wrapper);
+//        modelAssessTaskManualMapper.update(null, wrapper);
+          modelAssessTaskManualMapper.deleteByTaskid(id);
+          //删除当前数据对应的评估维度
+        modelAssessTaskDimensionMapper.deleteDataByTaskId(id);
+        //删除答案表对应的数据
+//        LambdaUpdateWrapper<ManualModelAnswerDO> answerwrapper = new LambdaUpdateWrapper<>();
+//        answerwrapper.eq(ManualModelAnswerDO::getManalTaskId,id);
+        manualModelAnswerMapper.deleteDataByTaskId(id);
     }
 
     private void validateModelAssessTaskManualExists (Long id) {

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanualbackup/ModelAssessTaskManualBackupServiceImpl.java

@@ -49,6 +49,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -95,6 +96,7 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa
     public Long createModelAssessTaskManualBackup (ModelAssessTaskManualBackupSaveReqVO createReqVO) {
         // 插入
         ModelAssessTaskManualBackupDO modelAssessTaskManualBackup = BeanUtils.toBean(createReqVO, ModelAssessTaskManualBackupDO.class);
+        modelAssessTaskManualBackup.setCreateTime(LocalDateTime.now());
         modelAssessTaskManualBackupMapper.insert(modelAssessTaskManualBackup);
         // 返回
         return modelAssessTaskManualBackup.getId();
@@ -143,9 +145,9 @@ public class ModelAssessTaskManualBackupServiceImpl implements ModelAssessTaskMa
 
     @Override
     public void unBackup (Long id) {
-        modelAssessTaskManualBackupMapper.deleteTrue(id);
-        modelAssessTaskDimensionBackupMapper.deleteTrue(id);
-        manualModelAnswerBackupMapper.deleteTrue(id);
+        modelAssessTaskManualBackupMapper.deleteByTaskid(id);
+        modelAssessTaskDimensionBackupMapper.deleteByTaskid(id);
+        manualModelAnswerBackupMapper.deleteByTaskid(id);
     }
 
     @Override

yudao-module-llm/yudao-module-llm-biz/src/main/resources/mapper/modelassesstaskmanual/ManualModelAnswerMapper.xml

@@ -8,5 +8,7 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-
+    <delete id="deleteDataByTaskId" parameterType="java.lang.Long">
+        delete from llm_manual_model_answer where manal_task_id=#{taskId}
+    </delete>
 </mapper>

yudao-module-llm/yudao-module-llm-biz/src/main/resources/mapper/modelassesstaskmanual/ModelAssessTaskDimensionMapper.xml

@@ -8,5 +8,7 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-
+    <delete id="deleteDataByTaskId" parameterType="java.lang.Long">
+        delete from llm_model_assess_task_dimension where task_id=#{taskId}
+    </delete>
 </mapper>

yudao-module-llm/yudao-module-llm-biz/src/main/resources/mapper/modelassesstaskmanual/ModelAssessTaskManualMapper.xml

@@ -9,4 +9,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <delete id="deleteByTaskid" parameterType="java.lang.Long">
+        delete from llm_model_assess_task_manual where id=#{taskId}
+    </delete>
 </mapper>

yudao-module-llm/yudao-module-llm-biz/src/main/resources/mapper/modelassesstaskmanualbackup/ManualModelAnswerBackupMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ManualModelAnswerBackupMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+    <delete id="deleteByTaskid" parameterType="java.lang.Long">
+        delete from llm_manual_model_answer_backup where manal_task_id=#{taskId}
+    </delete>
+</mapper>

yudao-module-llm/yudao-module-llm-biz/src/main/resources/mapper/modelassesstaskmanualbackup/ModelAssessTaskDimensionBackupMapper.xml

@@ -8,5 +8,7 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-
+    <delete id="deleteByTaskid" parameterType="java.lang.Long">
+        delete from llm_model_assess_task_dimension_backup where task_id=#{taskId}
+    </delete>
 </mapper>

yudao-module-llm/yudao-module-llm-biz/src/main/resources/mapper/modelassesstaskmanualbackup/ModelAssessTaskManualBackupMapper.xml

@@ -8,5 +8,7 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-
+    <delete id="deleteByTaskid" parameterType="java.lang.Long">
+        delete from llm_model_assess_task_manual_backup where id=#{taskId}
+    </delete>
 </mapper>