【CHG】修改报废的工具不再添加到新计划里

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecExperimentServiceImpl.java

@@ -10,12 +10,14 @@ import com.railway.business.safetool.domain.vo.SecExpListParmVo;
 import com.railway.business.safetool.domain.vo.SecExpListVo;
 import com.railway.business.safetool.domain.vo.SecExpNQParmVo;
 import com.railway.business.safetool.domain.vo.SecExpToolsVo;
+import com.railway.business.safetool.domain.vo.SecScheduledToolVo;
 import com.railway.business.safetool.enums.TestStateEnum;
 import com.railway.business.safetool.enums.ToolStateEnum;
 import com.railway.business.safetool.mapper.BaseSafetyToolMapper;
 import com.railway.business.safetool.mapper.SecExperimentMapper;
 import com.railway.business.safetool.mapper.SecExperimentToolMapper;
 import com.railway.business.safetool.mapper.SecScheduledMapper;
+import com.railway.business.safetool.mapper.SecScheduledToolMapper;
 import com.railway.business.safetool.service.ISecExperimentService;
 import com.railway.common.utils.SecurityUtils;
 import java.util.Date;
@@ -36,16 +38,19 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
   private final SecScheduledMapper scheduledMapper;
   private final SecExperimentMapper secExperimentMapper;
   private final SecExperimentToolMapper secExperimentToolMapper;
+  private final SecScheduledToolMapper scheduledToolMapper;
   private final BaseSafetyToolMapper toolMapper;
 
   public SecExperimentServiceImpl(
       SecScheduledMapper scheduledMapper,
       SecExperimentMapper secExperimentMapper,
       SecExperimentToolMapper secExperimentToolMapper,
+      SecScheduledToolMapper scheduledToolMapper,
       BaseSafetyToolMapper toolMapper) {
     this.scheduledMapper = scheduledMapper;
     this.secExperimentMapper = secExperimentMapper;
     this.secExperimentToolMapper = secExperimentToolMapper;
+    this.scheduledToolMapper = scheduledToolMapper;
     this.toolMapper = toolMapper;
   }
 
@@ -97,6 +102,10 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
       for(BaseSafetyTool tool : toolList){
         tool.setLastTestDate(secExperiment.getExpDate());
         toolMapper.update(tool);
+        SecScheduledToolVo scheduledToolVo = new SecScheduledToolVo();
+        scheduledToolVo.setScheduledId(secExperiment.getId());
+        scheduledToolVo.setToolId(tool.getToolId());
+        scheduledToolMapper.delete(scheduledToolVo);
       }
     }
     return ret;

railway-business/src/main/resources/mapper/safetool/SecScheduledToolMapper.xml

@@ -84,6 +84,13 @@
     delete from sec_scheduled_tool where scheduled_id = #{scheduledId} and tool_id = #{toolId}
   </delete>
 
+  <delete id="delScheduledTool">
+    delete t
+    from sec_scheduled_tool t, sec_experiment t1, sec_experiment_tool t2
+    where t.scheduled_id = t1.scheduled_id and t1.id = t2.exp_id and t.tool_id = t2.tool_id
+    and t2.isok = '0' and t1.id = #{id}
+  </delete>
+
   <select id="checkdel"
     parameterType="com.railway.business.safetool.domain.vo.SecScheduledToolVo"
     resultType="int">