diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApplyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApplyListRequest.java index 4d1cda3..4d90f25 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApplyListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApplyListRequest.java @@ -18,6 +18,9 @@ @ApiModelProperty(value = "表单id(流程定义对应的表单id,等价于业务id)", dataType = "String") private String formId; + @ApiModelProperty(value = "分包方id", dataType = "Long") + private Long outsourcerId; + @ApiModelProperty(value = "分包项目编号", dataType = "String") private String projectNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApplyListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApplyListRequest.java index 4d1cda3..4d90f25 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApplyListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/outsource/OutsourceProjectApplyListRequest.java @@ -18,6 +18,9 @@ @ApiModelProperty(value = "表单id(流程定义对应的表单id,等价于业务id)", dataType = "String") private String formId; + @ApiModelProperty(value = "分包方id", dataType = "Long") + private Long outsourcerId; + @ApiModelProperty(value = "分包项目编号", dataType = "String") private String projectNo; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java index 986c75f..d72c644 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceProjectServiceImpl.java @@ -232,11 +232,12 @@ wrapper.eq("id", 12344321); return wrapper; } + wrapper.eq(Objects.nonNull(request.getOutsourcerId()), "outsourcer_id", request.getOutsourcerId()); wrapper.like(StringUtils.isNotBlank(request.getProjectNo()), "project_no", request.getProjectNo()); wrapper.like(StringUtils.isNotBlank(request.getProjectName()), "project_name", request.getProjectName()); //验收状态若是草稿或空则可以被选择进行验收 // TODO: 2023/4/24 验收不通过也不能被再验收,根据后续需求调整 - wrapper.eq("check_approval_status", ApprovalStatusEnum.DRAFT).or().isNull("check_approval_status"); + wrapper.and(wr -> wr.or().eq("check_approval_status", ApprovalStatusEnum.DRAFT).or().isNull("check_approval_status")); wrapper.in("id", passedList); wrapper.orderByDesc("create_time"); return wrapper;