评价模块调整

src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateExecuterMapper.java

@@ -1,9 +1,11 @@
 package com.xjrsoft.module.evaluate.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.evaluate.dto.SaveEvaluateObjectDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateExecuter;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * @title: 评价执行人
@@ -14,10 +16,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface EvaluateExecuterMapper extends MPJBaseMapper<EvaluateExecuter> {
 
-    @Delete("DELETE FROM evaluate_executer WHERE id IN (" +
-            " SELECT id FROM (" +
-            " SELECT id FROM evaluate_executer WHERE evaluate_manage_id = #{evaluateManageId}" +
-            ") AS temp)")
-    Boolean deleteByEvaluateManageId(Long evaluateManageId);
+    @Delete("DELETE FROM evaluate_executer WHERE evaluate_object_id IN (" +
+            " SELECT id FROM evaluate_object WHERE evaluate_manage_id = #{dto.evaluateManageId} and base_grade_id = #{dto.gradeId} )")
+    Boolean deleteByEvaluateManageId(@Param("dto") SaveEvaluateObjectDto dto);
 
 }

src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateObjectMapper.java

@@ -3,6 +3,7 @@ package com.xjrsoft.module.evaluate.mapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.evaluate.dto.EvaluateObjectListDto;
 import com.xjrsoft.module.evaluate.dto.ObjectGradeDeleteDto;
+import com.xjrsoft.module.evaluate.dto.SaveEvaluateObjectDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateObject;
 import com.xjrsoft.module.evaluate.vo.EvaluateExecuterVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateObjectListVo;
@@ -28,11 +29,8 @@ public interface EvaluateObjectMapper extends MPJBaseMapper<EvaluateObject> {
 
     List<EvaluateExecuterVo> getNewExecuterList(@Param("dto") EvaluateObjectListDto dto);
 
-    @Delete("DELETE FROM evaluate_object WHERE id IN (" +
-            " SELECT id FROM (" +
-            "  id FROM evaluate_object WHERE evaluate_manage_id = #{evaluateManageId}" +
-            ") AS temp)")
-    Boolean deleteByEvaluateManageId(Long evaluateManageId);
+    @Delete("DELETE FROM evaluate_object WHERE evaluate_manage_id = #{dto.evaluateManageId} and base_grade_id = #{dto.gradeId}")
+    Boolean deleteByEvaluateManageId(@Param("dto") SaveEvaluateObjectDto dto);
 
     Boolean objectGradeDeleteExecuter(@Param("dto") ObjectGradeDeleteDto dto);
 

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

@@ -158,8 +158,9 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
         }
 
         //清空原有数据
-        evaluateObjectMapper.deleteByEvaluateManageId(evaluateManageVo.getId());
-        evaluateExecuterMapper.deleteByEvaluateManageId(evaluateManageVo.getId());
+        evaluateExecuterMapper.deleteByEvaluateManageId(dto);
+        evaluateObjectMapper.deleteByEvaluateManageId(dto);
+
 
         //保存新数据
         Date createDate = new Date();