【CHG】修改安全工具替换方法

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

@@ -283,19 +283,23 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     if(list.size() > 0){
       return new AjaxResult(AjaxResult.Type.WARN, "工具编号已存在");
     }
-
+    // 记录被替换掉的工具ID
     Long toolId = baseSafetyTool.getToolId();
+    Date date = new Date();
     //插入新的安全工具
-    baseSafetyTool.setCreateTime(new Date());
+    baseSafetyTool.setCreateTime(date);
+    baseSafetyTool.setUpdateTime(date);
     baseSafetyTool.setCreateBy(SecurityUtils.getUserIdString());
     baseSafetyTool.setState(ToolStateEnum.NORMAL.getCode());
     baseSafetyTool.setTestResult(ToolStateEnum.NORMAL.getCode());
+    baseSafetyTool.setTestResultDesc(ToolStateEnum.NORMAL.getInfo());
     safetyToolMapper.insert(baseSafetyTool);
 
     //将原安全工具状态设置为报废并记录替换ID
     BaseSafetyTool temp = new BaseSafetyTool();
     temp.setToolId(toolId);
-    temp.setScrapDate(new Date());
+    temp.setScrapDate(date);
+    temp.setUpdateTime(date);
     temp.setState(ToolStateEnum.SCRAP.getCode());
     temp.setTestResult(ToolStateEnum.SCRAP.getCode());
     temp.setScrapUser(SecurityUtils.getUserIdString());