diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java b/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java index 2b623299..dc333f97 100644 --- a/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java +++ b/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java @@ -174,4 +174,7 @@ public class Quote extends QueryPage { @TableField(exist = false) private Boolean isSimultaneous; + + @TableField(exist = false) + private String enStatus; } diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java index 6ff8433c..4e73d8ae 100644 --- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java @@ -342,21 +342,29 @@ public class QuoteServiceImpl extends ServiceImpl implements public void updateQuoteStatus(Quote quote) throws MessagingException, UnsupportedEncodingException { // 主表 lambdaUpdate() - .set(Quote::getStatus, "下达") + .set(Quote::getStatus, quote.getEnStatus()) .eq(Quote::getId, quote.getId()) .update(); // 明细 quoteGroupDetailService.lambdaUpdate() - .set(QuoteGroupDetail::getStatus, "下达") + .set(QuoteGroupDetail::getStatus, quote.getEnStatus()) .eq(QuoteGroupDetail::getQuoteId, quote.getId()) .update(); // 明细 quoteDetailService.lambdaUpdate() - .set(QuoteDetail::getStatus, "下达") + .set(QuoteDetail::getStatus,quote.getEnStatus()) .eq(QuoteDetail::getQuoteId, quote.getId()) .update(); - // 审批规则 - authRuleService.getFormAuthRule("1",quote.getSite(),quote.getBuNo(),quote.getQuoteVersionNo()); + if ("下达".equals(quote.getEnStatus())) { + // 审批规则 + authRuleService.getFormAuthRule("1",quote.getSite(),quote.getBuNo(),quote.getQuoteVersionNo()); + }else if ("驳回".equals(quote.getEnStatus())) { + inquiryApplicationService.lambdaUpdate() + .set(InquiryApplicationData::getStatus, quote.getEnStatus()) + .eq(InquiryApplicationData::getSite, quote.getSite()) + .eq(InquiryApplicationData::getRfqNo,quote.getInsideInquiryNo()) + .update(); + } } @Override