From d30e820afcf65c4061a5722daf012b67cf9e5ac9 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 19 Mar 2024 09:33:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseShuntingInvoicingApplyService.java                | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
index 1308a99b6d..1521c7a3b8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
@@ -39,11 +39,13 @@ import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicin
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.*;
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyTaskQuery;
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.SubmitBaseShuntingInvoicingApplyDto;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
 import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService;
+import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
@@ -118,6 +120,8 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
     @Autowired
     private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
+    @Autowired
+    private BaseVehicleService baseVehicleService;
 
     private QueryWrapper<BaseShuntingInvoicingApply> createQueryWrapper(BaseShuntingInvoicingApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -440,7 +444,9 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
                     }
                     //推送开票管理
                     FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
-                    finVehicleInvoiceDto.setInvoiceTitle(baseShuntingInvoicinApplyeVehDetailsVo.getInvoicinCompanyName());
+                    BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(baseShuntingInvoicinApplyeVehDetailsVo.getVinNo() , baseShuntingInvoicingApply.getCallOutOrgSid());
+                    FinCompanyInvoicingDetailsVo companyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsBySystem(baseVehicle.getPurchaseSystemSid()).getData();
+                    finVehicleInvoiceDto.setInvoiceTitle(companyInvoicingDetailsVo.getName());
                     finVehicleInvoiceDto.setContractNo("");
                     BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseShuntingInvoicinApplyeVehDetailsVo.getPurchaseSid());
                     FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(baseShuntingInvoicingApply.getCallInOrgSid(), baseInternalPurchaseVehicle.getCallInBuyerOrgSid()).getData();

From 1f1f16146f02220d308a46b4acaad031f1218ae8 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 19 Mar 2024 15:24:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=A0=E6=AC=BE?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delinquentcustomerfilingAdd.vue                  | 10 ++++++++++
 .../delinquentcustomerfilingInfo.vue                 | 12 ++++++------
 .../delinquentcustomerfilingDaiBan.vue               | 12 ++++++------
 .../delinquentcustomerfilingEdit.vue                 | 10 ++++++++++
 .../delinquentcustomerfilingYiBan.vue                | 10 +++++-----
 5 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingAdd.vue b/anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingAdd.vue
index 8415e10a3d..a436fe3fc9 100644
--- a/anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingAdd.vue
+++ b/anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingAdd.vue
@@ -581,6 +581,16 @@ export default {
             this.$message({ showClose: true, type: 'error', message: '证件号码不能为空' })
             return
           }
+          if (this.formobj.customerTypeKey === '1') {
+            if (this.formobj.isAnchored === '') {
+              this.$message({ showClose: true, type: 'error', message: '是否挂靠运输公司请选择是或否' })
+              return
+            }
+            if (this.formobj.isAnchored === '1' && (this.formobj.businessName === '' || this.formobj.taxpayerNo === '')) {
+              this.$message({ showClose: true, type: 'error', message: '是否挂靠运输公司选则是的情况下,请完善挂靠运输公司信息' })
+              return
+            }
+          }
           this.getUrl()
           this.submitdisabled = true
           req.submit(this.formobj).then((res) => {
diff --git a/anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingInfo.vue b/anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingInfo.vue
index 5f8437c176..4c41049df9 100644
--- a/anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingInfo.vue
+++ b/anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingInfo.vue
@@ -83,7 +83,7 @@
           <el-col :span="8">
             <div v-show="formobj.customerTypeKey == '1'">
               <div class="span-sty">是否挂靠运输公司</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.isAnchored = '1' ? '是' : '否' }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.isAnchored == 1 ? '是' : '否' }}</span></el-form-item>
             </div>
           </el-col>
         </el-row>
@@ -113,7 +113,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '是'">
+        <div v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
           <div class="title">挂靠运输公司信息</div>
           <el-row>
             <el-col :span="16">
@@ -147,17 +147,17 @@
           </el-row>
         </div>
         <div class="title">附件清单</div>
-        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '是')">
+        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '1')">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.license" :key="index" :src="item" :preview-src-list="formobj.license"/></el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '否')">
+        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '0')">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span v-show="formobj.customerTypeKey === '2'">法人和实际控制人身份证</span>
-              <span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '否'">本人身份证</span>
+              <span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '0'">本人身份证</span>
             </div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.idCard" :key="index" :src="item" :preview-src-list="formobj.idCard"/></el-form-item>
           </el-col>
@@ -168,7 +168,7 @@
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.infoLetter" :key="index" :src="item" :preview-src-list="formobj.infoLetter"/></el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '是'">
+        <el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车队挂靠协议</div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.agreement" :key="index" :src="item" :preview-src-list="formobj.agreement"/></el-form-item>
diff --git a/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingDaiBan.vue
index 34294048ce..4a242ab23e 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingDaiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingDaiBan.vue
@@ -86,7 +86,7 @@
           <el-col :span="8">
             <div v-show="formobj.customerTypeKey == '1'">
               <div class="span-sty">是否挂靠运输公司</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.isAnchored = '1' ? '是' : '否' }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.isAnchored == 1 ? '是' : '否' }}</span></el-form-item>
             </div>
           </el-col>
         </el-row>
@@ -116,7 +116,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '是'">
+        <div v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
           <div class="title">挂靠运输公司信息</div>
           <el-row>
             <el-col :span="16">
@@ -150,17 +150,17 @@
           </el-row>
         </div>
         <div class="title">附件清单</div>
-        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '是')">
+        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '1')">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.license" :key="index" :src="item" :preview-src-list="formobj.license"/></el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '否')">
+        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '0')">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span v-show="formobj.customerTypeKey === '2'">法人和实际控制人身份证</span>
-              <span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '否'">本人身份证</span>
+              <span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '0'">本人身份证</span>
             </div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.idCard" :key="index" :src="item" :preview-src-list="formobj.idCard"/></el-form-item>
           </el-col>
@@ -171,7 +171,7 @@
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.infoLetter" :key="index" :src="item" :preview-src-list="formobj.infoLetter"/></el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '是'">
+        <el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车队挂靠协议</div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.agreement" :key="index" :src="item" :preview-src-list="formobj.agreement"/></el-form-item>
diff --git a/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingEdit.vue
index b5b139117e..d496c3c315 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingEdit.vue
@@ -584,6 +584,16 @@ export default {
             this.$message({ showClose: true, type: 'error', message: '证件号码不能为空' })
             return
           }
+          if (this.formobj.customerTypeKey === '1') {
+            if (this.formobj.isAnchored === '') {
+              this.$message({ showClose: true, type: 'error', message: '是否挂靠运输公司请选择是或否' })
+              return
+            }
+            if (this.formobj.isAnchored === '1' && (this.formobj.businessName === '' || this.formobj.taxpayerNo === '')) {
+              this.$message({ showClose: true, type: 'error', message: '是否挂靠运输公司选则是的情况下,请完善挂靠运输公司信息' })
+              return
+            }
+          }
           this.getUrl()
           this.submitdisabled = true
           req.submit(this.formobj).then((res) => {
diff --git a/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingYiBan.vue
index c87dbbf351..34f59d1da4 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingYiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingYiBan.vue
@@ -83,7 +83,7 @@
           <el-col :span="8">
             <div v-show="formobj.customerTypeKey == '1'">
               <div class="span-sty">是否挂靠运输公司</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.isAnchored = '1' ? '是' : '否' }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.isAnchored == 1 ? '是' : '否' }}</span></el-form-item>
             </div>
           </el-col>
         </el-row>
@@ -147,17 +147,17 @@
           </el-row>
         </div>
         <div class="title">附件清单</div>
-        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '是')">
+        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '1')">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.license" :key="index" :src="item" :preview-src-list="formobj.license"/></el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '否')">
+        <el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '0')">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span v-show="formobj.customerTypeKey === '2'">法人和实际控制人身份证</span>
-              <span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '否'">本人身份证</span>
+              <span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '0'">本人身份证</span>
             </div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.idCard" :key="index" :src="item" :preview-src-list="formobj.idCard"/></el-form-item>
           </el-col>
@@ -168,7 +168,7 @@
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.infoLetter" :key="index" :src="item" :preview-src-list="formobj.infoLetter"/></el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '是'">
+        <el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
           <el-col :span="24">
             <div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车队挂靠协议</div>
             <el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.agreement" :key="index" :src="item" :preview-src-list="formobj.agreement"/></el-form-item>