From b80848db565b76155c908f350561c4cc74cca6fb Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 30 Mar 2026 22:18:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=83=BD=E5=8A=9B=E5=92=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=91=A8=E6=9C=9F=E6=A3=80=E6=B5=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/controller/CraftAbilityController.java | 6 ++++++ .../desk/quality/controller/InspectionItemController.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index 492ed33a..b50c8a73 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -60,6 +60,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -196,6 +197,11 @@ public class CraftAbilityController extends BladeController { if(craftAbilityService.count(queryWrapper) > 0){ return R.fail("编码已存在"); } + + if(null == craftAbility.getLocalArea()){ + craftAbility.setLocalArea(new BigDecimal("-1")); + } + return R.status(craftAbilityService.updateById(craftAbility)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java index 95d64c95..a982711a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -146,6 +146,9 @@ public class InspectionItemController extends BladeController { @ApiLog("修改检验项目") @Operation(summary = "修改一条", description = "传入InspectionItem Obj") public R update(@Valid @RequestBody InspectionItem updateOne) { + if(null == updateOne.getStandardWorkMinute()){ + updateOne.setStandardWorkMinute(-1D); + } return R.status(service.updateById(updateOne)); }