评价模块调整

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateObjectServiceImpl.java

@@ -9,6 +9,7 @@ import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.EvaluateTypeEnum;
 import com.xjrsoft.common.exception.MyException;
+import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.courseTable.dto.ClassTeacherDto;
@@ -158,9 +159,21 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         }
 
         //清空原有数据
-        evaluateExecuterMapper.deleteByEvaluateManageId(dto);
-        evaluateObjectMapper.deleteByEvaluateManageId(dto);
+        String delSql = "DELETE FROM evaluate_executer WHERE evaluate_object_id IN (" +
+                " SELECT id FROM evaluate_object WHERE evaluate_manage_id = #{dto.evaluateManageId}";
+        if(dto.getObjectList() != null && !dto.getObjectList().isEmpty()){
+            List<String> gradeIds = dto.getObjectList().stream().map(AddEvaluateObjectDto::getGradeId).collect(Collectors.toList());
+            delSql += " and base_grade_id = (" + gradeIds.toString().replace("[", "").replace("]", "") + ")";
+        }
+        delSql += ")";
+        SqlRunnerAdapter.db().delete(delSql);
 
+        delSql = "DELETE FROM evaluate_object WHERE evaluate_manage_id = " + dto.getEvaluateManageId();
+        if(dto.getObjectList() != null && !dto.getObjectList().isEmpty()){
+            List<String> gradeIds = dto.getObjectList().stream().map(AddEvaluateObjectDto::getGradeId).collect(Collectors.toList());
+            delSql += " and base_grade_id = (" + gradeIds.toString().replace("[", "").replace("]", "") + ")";
+        }
+        SqlRunnerAdapter.db().delete(delSql);
 
         //保存新数据
         Date createDate = new Date();

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -317,6 +317,11 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
                     new QueryWrapper<EvaluateResult>().lambda()
                             .eq(EvaluateResult::getSubmitRecordId, mobileResultPageVo.getEvaluateSubmitRecordId())
             );
+
+            evaluateSubmitRecordMapper.delete(
+                    new QueryWrapper<EvaluateSubmitRecord>().lambda()
+                            .eq(EvaluateSubmitRecord::getId, mobileResultPageVo.getEvaluateSubmitRecordId())
+            );
         }
 
         List<AddEvaluateResultDto> resultList = dto.getResultList();