diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java index 8e8a66e1..c8a9d68a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java @@ -28,7 +28,7 @@ public interface ReviewSheetConst { /** * 新建 内部 ERP 都用 */ - Integer S_NEW = 1; + Integer S_NEW = 0; /** * 待审理 内部用 ERP不用 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 459dbe85..b9a02703 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -148,9 +148,11 @@ public class NgController extends BladeController { @GetMapping("/listForSelectWTDL") @ApiOperationSupport(order = 22) @Operation(summary = "[问题大类]list下拉选择", description = "") - public R> listForSelectWTDL() { + public R> listForSelectWTDL(@Parameter(description = "parentId", required = true) + @RequestParam Long parentId) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); qw.eq(Ng::getNgType, NgConst.TYPE_3); + qw.eq(Ng::getParentId, parentId); qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); List list = service.list(qw); List listVO = NgWrapper.build().listVO(list); @@ -164,7 +166,7 @@ public class NgController extends BladeController { @ApiOperationSupport(order = 22) @Operation(summary = "[问题小类]list下拉选择", description = "") public R> listForSelectWTXL( - @Parameter(description = "parentId", required = true) @RequestParam Integer parentId) { + @Parameter(description = "parentId", required = true) @RequestParam Long parentId) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); qw.eq(Ng::getNgType, NgConst.TYPE_4); qw.eq(Ng::getParentId, parentId); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index f6e82b7c..ed4003a9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -1879,7 +1879,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl