Merge remote-tracking branch 'origin/master'

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;
 }

src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java

@@ -342,21 +342,29 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> 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