diff --git a/src/main/java/com/xujie/modules/supplier/data/PurQuotationReplyHistData.java b/src/main/java/com/xujie/modules/supplier/data/PurQuotationReplyHistData.java index fbb2e07..462942b 100644 --- a/src/main/java/com/xujie/modules/supplier/data/PurQuotationReplyHistData.java +++ b/src/main/java/com/xujie/modules/supplier/data/PurQuotationReplyHistData.java @@ -147,6 +147,9 @@ public class PurQuotationReplyHistData extends QueryPage { @ApiModelProperty(value = "排除状态") private String notExistsStatus; + @ApiModelProperty(value = "审批筛选:need-需要审批 none-不需要审批 all-全部") + private String approvalFilter; + public Object getKey() { return this.id; } diff --git a/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java b/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java index 7e90e47..b1082a7 100644 --- a/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java +++ b/src/main/java/com/xujie/modules/supplier/service/impl/PurQuotationReplyHistServiceImpl.java @@ -48,6 +48,10 @@ public class PurQuotationReplyHistServiceImpl extends ServiceImpl Objects.equals("已接受", d.getStatus())); - if (!allAccepted) { + boolean allFinished = details.stream().allMatch(this::isDetailFinishedStatus); + if (!allFinished) { return; } PurQuotationHeaderData headerQuery = new PurQuotationHeaderData(); @@ -163,4 +167,9 @@ public class PurQuotationReplyHistServiceImpl extends ServiceImpl and A.supplier_id = '%${query.supplierId}%' and A.supplier_name like '%${query.supplierName}%' diff --git a/src/main/resources/mapper/supplier/PurQuotationReplyHistMapper.xml b/src/main/resources/mapper/supplier/PurQuotationReplyHistMapper.xml index 6cf0e88..398d3a1 100644 --- a/src/main/resources/mapper/supplier/PurQuotationReplyHistMapper.xml +++ b/src/main/resources/mapper/supplier/PurQuotationReplyHistMapper.xml @@ -119,6 +119,8 @@ and A.reason like '%${query.reason}%' and A.remark2 like '%${query.remark2}%' and A.status like '%${query.status}%' + and A.status = '已报价' + and A.status != '已报价' and A.seq_no = '${query.seqNo}' and B.status not in ('${query.notExistsStatus}')