工艺能力和项目周期检测修改

liweidong
pangyang 2 weeks ago
parent 0c57b26357
commit b80848db56
  1. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java
  2. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java

@ -60,6 +60,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -196,6 +197,11 @@ public class CraftAbilityController extends BladeController {
if(craftAbilityService.count(queryWrapper) > 0){ if(craftAbilityService.count(queryWrapper) > 0){
return R.fail("编码已存在"); return R.fail("编码已存在");
} }
if(null == craftAbility.getLocalArea()){
craftAbility.setLocalArea(new BigDecimal("-1"));
}
return R.status(craftAbilityService.updateById(craftAbility)); return R.status(craftAbilityService.updateById(craftAbility));
} }

@ -146,6 +146,9 @@ public class InspectionItemController extends BladeController {
@ApiLog("修改检验项目") @ApiLog("修改检验项目")
@Operation(summary = "修改一条", description = "传入InspectionItem Obj") @Operation(summary = "修改一条", description = "传入InspectionItem Obj")
public R update(@Valid @RequestBody InspectionItem updateOne) { public R update(@Valid @RequestBody InspectionItem updateOne) {
if(null == updateOne.getStandardWorkMinute()){
updateOne.setStandardWorkMinute(-1D);
}
return R.status(service.updateById(updateOne)); return R.status(service.updateById(updateOne));
} }

Loading…
Cancel
Save