From 7a0425d1b5d324b81e97bd19cb68410dfb40567c Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Wed, 10 Aug 2022 12:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8A=A0=E5=8E=82=E5=AE=B6?=
 =?UTF-8?q?=E8=AE=A4=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/busvehicleapply/BusVehicleApplyQuery.java     | 6 ++++++
 .../BaseManufactorSubscriptionService.java                 | 3 +++
 .../base/biz/busvehicleapply/BusVehicleApplyService.java   | 7 +++++++
 3 files changed, 16 insertions(+)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
index 9920a67389..2affb82760 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
@@ -31,4 +31,10 @@ public class BusVehicleApplyQuery implements Query {
     private String modelName;
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+
+    @ApiModelProperty("采购类型")
+    private String applyTypeKey;
+
+    @ApiModelProperty("采购原因")
+    private String schedulingTypeKey;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
index 6269cbe910..88419365ac 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
@@ -213,6 +213,9 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         if (baseManufactorSubscription == null) {
             return rb.setMsg("该数据不存在");
         }
+        if (baseManufactorSubscription.getState() == 1) {
+            return rb.setMsg("该数据已认款,请勿重复操作");
+        }
         String witMatUrl = baseManufactorSubscription.getWitMatUrl();
         if (StringUtils.isBlank(witMatUrl)) {
             return rb.setMsg("请优先上传见证材料");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index aa09636c6a..6fb3b50e1a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -116,6 +116,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (StringUtils.isNotBlank(query.getUserSid())) {
                 qw.eq("bva.createBySid", query.getUserSid());
             }
+            if(StringUtils.isNotBlank(query.getApplyTypeKey())){
+                qw.eq("bva.applyTypeKey",query.getApplyTypeKey());
+            }
+            if(StringUtils.isNotBlank(query.getSchedulingTypeKey())){
+                qw.eq("bva.schedulingTypeKey",query.getSchedulingTypeKey());
+            }
+
             //查询分公司sid
 //            if (StringUtils.isNotBlank(query.getUserSid())) {
 //                String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();