【CHG】修改安全工具测试状态

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

@@ -300,8 +300,6 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     temp.setToolId(toolId);
     temp.setScrapDate(date);
     temp.setUpdateTime(date);
-    temp.setState(ToolStateEnum.SCRAP.getCode());
-    temp.setTestResult(ToolStateEnum.SCRAP.getCode());
     temp.setScrapUser(SecurityUtils.getUserIdString());
     temp.setReplaceToolId(baseSafetyTool.getToolId());
     safetyToolMapper.update(temp);

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

@@ -219,14 +219,16 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
       experimentTool = secExperimentToolMapper.getInfoByExpId(param.getToolId(),
           param.getExperimentId());
     }
+    Date date = new Date();
     experimentTool.setIsok(param.getIsok());
-    experimentTool.setUpdateTime(new Date());
+    experimentTool.setUpdateTime(date);
     experimentTool.setUpdateBy(SecurityUtils.getUserIdString());
     int ret = secExperimentToolMapper.update(experimentTool);
     if (ret > 0 && ToolStateEnum.SCRAP.getCode().equals(param.getIsok())) {
       // 同时更新安全工具记录状态为报废
       BaseSafetyTool tool = toolMapper.getInfo(experimentTool.getToolId());
       tool.setState(ToolStateEnum.SCRAP.getCode());
+      tool.setTestDate(date);
       tool.setTestResult(ToolStateEnum.SCRAP.getCode());
       tool.setTestResultDesc(ToolStateEnum.SCRAP.getInfo());
       toolMapper.update(tool);