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

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

@@ -109,15 +109,7 @@ public class BaseSafetyToolController extends BaseController {
   @PostMapping("/replaceTool")
   public AjaxResult replaceTool(@Validated @RequestBody BaseSafetyTool baseSafetyTool) {
     //校验安全工具有效编码唯一
-    BaseSafetyTool validate = new BaseSafetyTool();
-    validate.setToolCode(baseSafetyTool.getToolCode());
-    validate.setState(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));
-    } else {
-      return new AjaxResult(AjaxResult.Type.WARN, "工具编号已存在");
-    }
+    return baseSafetyToolService.replaceTool(baseSafetyTool);
   }
 
   @ApiOperation(value = "导出安全工具台账")

railway-business/src/main/java/com/railway/business/safetool/service/IBaseSafetyToolService.java

@@ -65,7 +65,7 @@ public interface IBaseSafetyToolService{
     /**
      *  替换安全工具
      */
-    int replaceTool(BaseSafetyTool baseSafetyTool);
+    AjaxResult replaceTool(BaseSafetyTool baseSafetyTool);
 
     /**
      *  刷新二维码

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

@@ -273,7 +273,17 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
-  public int replaceTool(BaseSafetyTool baseSafetyTool) {
+  public AjaxResult replaceTool(BaseSafetyTool baseSafetyTool) {
+
+    //校验安全工具有效编码唯一
+    BaseSafetyTool validate = new BaseSafetyTool();
+    validate.setToolCode(baseSafetyTool.getToolCode());
+    validate.setState(ToolStateEnum.NORMAL.getCode());
+    List<BaseSafetyTool> list = getList(validate);
+    if(list.size() > 0){
+      return new AjaxResult(AjaxResult.Type.WARN, "工具编号已存在");
+    }
+
     Long toolId = baseSafetyTool.getToolId();
     //插入新的安全工具
     baseSafetyTool.setCreateTime(new Date());
@@ -290,8 +300,9 @@ public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
     temp.setTestResult(ToolStateEnum.SCRAP.getCode());
     temp.setScrapUser(SecurityUtils.getUserIdString());
     temp.setReplaceToolId(baseSafetyTool.getToolId());
+    safetyToolMapper.update(temp);
 
-    return safetyToolMapper.update(temp);
+    return AjaxResult.success();
   }
 
   /**