【CHG】修改安全工具详情中实验状态

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

@@ -62,12 +62,6 @@ public class SecQcodeController extends BaseController {
         return AjaxResult.error("非本车间安全工具，请检查！");
       }
     }
-    // 是否已报废
-    if (tool.getState().equals(ToolStateEnum.NORMAL.getCode())) {
-      safetyToolService.setBaseSafetyTool(tool);
-    } else {
-      tool.setTestState(ToolTestStateEnum.SCRAP.getCode());
-    }
     AjaxResult ajax = AjaxResult.success();
     ajax.put("info", tool);
     return ajax;

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

@@ -120,7 +120,9 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
    */
   @Override
   public BaseSafetyTool getInfo(Long toolId) {
-    return safetyToolMapper.getInfo(toolId);
+    BaseSafetyTool tool = safetyToolMapper.getInfo(toolId);
+    setBaseSafetyTool(tool);
+    return tool;
   }
 
   /**
@@ -128,7 +130,9 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
    */
   @Override
   public BaseSafetyTool getInfoByQcode(String qcode) {
-    return safetyToolMapper.getInfoByQcode(qcode);
+    BaseSafetyTool tool = safetyToolMapper.getInfoByQcode(qcode);
+    setBaseSafetyTool(tool);
+    return tool;
   }
 
   /**
@@ -136,6 +140,11 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
    */
   @Override
   public void setBaseSafetyTool(BaseSafetyTool tool) {
+    // 是否已报废
+    if (!tool.getState().equals(ToolStateEnum.NORMAL.getCode())) {
+      tool.setTestState(ToolTestStateEnum.SCRAP.getCode());
+      return;
+    }
     // 查询该工具相关的 待送检 计划
     List<SecScheduled> scheduledList = scheduledMapper.listScheduled(tool.getToolId());
     if(CollectionUtils.isNotEmpty(scheduledList)){