【CHG】修改安全工具状态

railway-admin/src/main/java/com/railway/web/controller/business/safetool/BaseSafetyToolController.java

@@ -93,6 +93,7 @@ public class BaseSafetyToolController extends BaseController {
   public TableDataInfo listScrapTool(BaseSafetyTool baseSafetyTool) {
     startPage();
     baseSafetyTool.setState(ToolStateEnum.SCRAP.getCode());
+    baseSafetyTool.setTestResult(ToolStateEnum.NORMAL.getCode());
     List<BaseSafetyTool> list = baseSafetyToolService.getList(baseSafetyTool);
     return getDataTable(list);
   }
@@ -112,6 +113,7 @@ public class BaseSafetyToolController extends BaseController {
     BaseSafetyTool validate = new BaseSafetyTool();
     validate.setToolCode(baseSafetyTool.getToolCode());
     validate.setState(ToolStateEnum.NORMAL.getCode());
+    validate.setTestResult(ToolStateEnum.NORMAL.getCode());
     List<BaseSafetyTool> list = baseSafetyToolService.getList(validate);
     if (list.size() == 1 && list.get(0).getToolId().equals(baseSafetyTool.getToolId())) {
       return toAjax(baseSafetyToolService.replaceTool(baseSafetyTool));

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

@@ -87,6 +87,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     baseSafetyTool.setCreateTime(new Date());
     baseSafetyTool.setCreateBy(SecurityUtils.getUsername());
     baseSafetyTool.setState(ToolStateEnum.NORMAL.getCode());
+    baseSafetyTool.setTestResult(ToolStateEnum.NORMAL.getCode());
     setTool(baseSafetyTool);
     return safetyToolMapper.insert(baseSafetyTool);
   }
@@ -291,6 +292,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     baseSafetyTool.setCreateTime(new Date());
     baseSafetyTool.setCreateBy(SecurityUtils.getUsername());
     baseSafetyTool.setState(ToolStateEnum.NORMAL.getCode());
+    baseSafetyTool.setTestResult(ToolStateEnum.NORMAL.getCode());
     safetyToolMapper.insert(baseSafetyTool);
 
     //将原安全工具状态设置为报废并记录替换ID
@@ -298,6 +300,7 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     temp.setToolId(toolId);
     temp.setScrapDate(new Date());
     temp.setState(ToolStateEnum.SCRAP.getCode());
+    temp.setTestResult(ToolStateEnum.SCRAP.getCode());
     temp.setScrapUser(SecurityUtils.getUsername());
     temp.setReplaceToolId(baseSafetyTool.getToolId());
 

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

@@ -207,6 +207,7 @@ public class SecExperimentServiceImpl implements ISecExperimentService {
       // 同时更新安全工具记录状态为报废
       BaseSafetyTool tool = toolMapper.getInfo(experimentTool.getToolId());
       tool.setState(ToolStateEnum.SCRAP.getCode());
+      tool.setTestResult(ToolStateEnum.SCRAP.getCode());
       tool.setTestResultDesc(ToolStateEnum.SCRAP.getInfo());
       toolMapper.update(tool);
     }