Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -300,14 +300,14 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         /***************************************挂车入库判断***************************************/
         BaseTrailerModelDetailsVo baseTrailerModelDetailsVo = baseTrailerModelService.fetchDetailsVoBySid(baseTrailer.getTrailerModelSid());
         String trailerTypeKey = baseTrailerModelDetailsVo.getTrailerTypeKey();
-        String appearanceSizeLong = baseTrailerModelDetailsVo.getAppearanceSizeLong();
+        BigDecimal appearanceSizeLong = new BigDecimal(baseTrailerModelDetailsVo.getAppearanceSizeLong()).divide(new BigDecimal("1000"));
         String orderSid = busSalesOrderVehicleFeign.selectOneByVehSidAndNotStop(vehSid).getData();
         if (StringUtils.isNotBlank(orderSid)){
             List<BusSalesOrderTrailerDetailsVo> data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(orderSid).getData();
             if (data != null && data.size() > 0){
                 Boolean tg = false;
                 for (BusSalesOrderTrailerDetailsVo datum : data) {
-                    if (datum.getAppearanceSizeLong().toString().equals(appearanceSizeLong) && datum.getTrailerTypeKey().equals(trailerTypeKey)){
+                    if (datum.getAppearanceSizeLong().compareTo(appearanceSizeLong) == 0 && datum.getTrailerTypeKey().equals(trailerTypeKey)){
                         tg = true;
                         break;
                     }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java

@@ -83,6 +83,8 @@ public class BusSalesOrderMakeupDetailsVo implements Vo {
     @ApiModelProperty("合同中的上装信息")
     private String topMessage;
 
+    private String buyTypeKey;
+
     private int isMain;
 
 }

anrui-riskcenter-ui/src/api/repaymentschedule/repaymentschedule.js

@@ -27,10 +27,10 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  // 查看多台还款计划--回显(详情)
-  viewVinsSchedule: function(data) {
+  // 查看还款计划--回显(详情)
+  scheduleDetails: function(data) {
     return request({
-      url: '/riskcenter/v1/loanrepaymentschedule/viewVinsSchedule',
+      url: '/riskcenter/v1/loanrepaymentschedule/scheduleDetails',
       method: 'get',
       params: data
     })

anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue

@@ -253,18 +253,20 @@
             </el-col>
           </el-row>
         </div>
-        <div class="title">车辆及上装采购合同</div>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty"><span class="icon">*</span>挂车或上装是否公司采购</div>
-            <el-form-item>
-              <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.isCompBuy">
-                <el-radio label="0">是</el-radio>
-                <el-radio label="1">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <div v-if="formobj.szOrGc !== ''">
+          <div class="title">车辆及上装采购合同</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span class="icon">*</span>挂车或上装是否公司采购</div>
+              <el-form-item>
+                <el-radio-group :disabled="formobj.szOrGc == '上装'" class="addinputInfo" style="font-size: 1px" v-model="formobj.isCompBuy">
+                  <el-radio label="0">是</el-radio>
+                  <el-radio label="1">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
       </el-form>
     </div>
   </div>
@@ -326,7 +328,8 @@ export default {
         spouseMobile: '',
         spouseName: '',
         spouseRegisterAddress: '',
-        vehRegis: ''
+        vehRegis: '',
+        szOrGc: ''
       },
       rules: {
         idNumber: [{ required: true, message: '借款人身份证号不能为空', trigger: 'blur' }],
@@ -550,7 +553,8 @@ export default {
         spouseMobile: '',
         spouseName: '',
         spouseRegisterAddress: '',
-        vehRegis: ''
+        vehRegis: '',
+        szOrGc: ''
       }
       this.submitdisabled = false
       this.contractDisabled = false

anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue

@@ -60,11 +60,11 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-<!--            <el-table-column label="操作" width="130" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+            <el-table-column label="操作" width="130" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
             <el-table-column prop="builded" label="生成状态" align="center" width="100"/>
             <el-table-column prop="repaymentCreateTime" label="生成日期" align="center" width="100"/>
             <el-table-column prop="useOrgName" label="分公司" align="center" width="120"/>

anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleInfo.vue

@@ -4,7 +4,7 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
-          <el-button type="primary" size="small" @click="lookBike()">查看单车还款计划表</el-button>
+          <el-button type="primary" size="small" @click="lookBike()">查看明细</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -20,41 +20,55 @@
               <el-form-item><span class="addinputInfo">{{ formobj.borrowerName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">车辆台数</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.vehCount }}</span></el-form-item>
+              <div class="span-sty">贷款总金额(台数)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amountAll }}({{ formobj.vehCount }})</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title titleOne">
+            <div>主金融产品<span>{{ (formobj.policyName) }}</span></div>
+          </div>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">资方</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.bankName }}</span></el-form-item>
+              <div class="span-sty">单车贷款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanAmount }}</span></el-form-item>
             </el-col>
-            <el-col :span="16" class="tlineheightb">
-              <div class="span-sty">涉及车架号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+            <el-col :span="8">
+              <div class="span-sty">期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.mainPeriod }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">首期还款日</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.mainRepayDate }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-table :key="tableKey" :data="formobj.scheduleVins" border style="width: 100%">
-            <el-table-column prop="period" width="60" label="期数" align="center"/>
-            <el-table-column label="还款月份" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.repayMonth }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="'月还(' + formobj.mainRepayDate + '日)'" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.mainRepay }}</span>
-              </template>
+          <div v-if="formobj.isOtherPolicy == '1'">
+            <div class="title">其它融<span>({{ formobj.otherPolicyName }})</span></div>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">单车贷款金额</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherAmount }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">期数</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPeriod }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">首期还款日</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherRepayDate }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vinList" border style="width: 100%">
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="120" />
+            <el-table-column label="主金融产品" align="center">
+              <el-table-column prop="mainFirstRepay" label="首期月还" align="center" min-width="120" />
+              <el-table-column prop="mainMidRepay" label="期间月还" align="center" min-width="120" />
+              <el-table-column prop="mainLastRepay" label="末期月还" align="center" min-width="120" />
             </el-table-column>
-            <el-table-column v-if="formobj.isOtherPolicy == '1'" :label="'其它融月还(' + formobj.otherRepayDate + '日)'" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.otherRepay }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="formobj.isOtherPolicy == '1'" label="合计" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.amount }}</span>
-              </template>
+            <el-table-column v-if="formobj.isOtherPolicy == '1'" label="其它融" align="center">
+              <el-table-column prop="otherFirstRepay" label="首期月还" align="center" min-width="120" />
+              <el-table-column prop="otherMidRepay" label="期间月还" align="center" min-width="120" />
+              <el-table-column prop="otherLastRepay" label="末期月还" align="center" min-width="120" />
             </el-table-column>
           </el-table>
         </el-form>
@@ -80,23 +94,28 @@ export default {
       viewState: 1,
       tableKey: 0,
       formobj: {
-        salesOrderSid: '',
+        sid: '',
         loanContractNo: '',
         borrowerName: '',
-        bankName: '',
+        amountAll: '',
         vehCount: '',
-        vinNo: '',
-        isOtherPolicy: '',
+        policyName: '',
+        loanAmount: '',
+        mainPeriod: '',
         mainRepayDate: '',
+        otherPolicyName: '',
+        otherAmount: '',
+        otherPeriod: '',
         otherRepayDate: '',
-        scheduleVins: []
+        vinList: [],
+        isOtherPolicy: ''
       }
     }
   },
   methods: {
     showInfo(row) {
       this.viewTitle = '单车还款计划表'
-      req.viewVinsSchedule({ salesOrderSid: row.salesOrderSid }).then((res) => {
+      req.scheduleDetails({ salesOrderSid: row.salesOrderSid }).then((res) => {
         if (res.success) {
           this.formobj = res.data
         }
@@ -111,16 +130,21 @@ export default {
     },
     handleReturn() {
       this.formobj = {
-        salesOrderSid: '',
+        sid: '',
         loanContractNo: '',
         borrowerName: '',
-        bankName: '',
+        amountAll: '',
         vehCount: '',
-        vinNo: '',
-        isOtherPolicy: '',
+        policyName: '',
+        loanAmount: '',
+        mainPeriod: '',
         mainRepayDate: '',
+        otherPolicyName: '',
+        otherAmount: '',
+        otherPeriod: '',
         otherRepayDate: '',
-        scheduleVins: []
+        vinList: [],
+        isOtherPolicy: ''
       }
       this.$emit('doback')
     }
@@ -135,17 +159,4 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
-.tlineheightb {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-items: center;
-}
-/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
-  line-height: 15px !important;
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-items: center;
-}
 </style>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java

@@ -89,4 +89,6 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo {
     private String isCompBuy;
     @ApiModelProperty("001一车一合同 002一贷款人一合同")
     private String conSetUpKey;
+    @ApiModelProperty("上装或挂车")
+    private String szOrGc;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -34,6 +34,10 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupFeign;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
@@ -127,6 +131,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
+    private BusSalesOrderMakeupFeign busSalesOrderMakeupFeign;
+    @Autowired
+    private BusSalesOrderTrailerFeign busSalesOrderTrailerFeign;
+    @Autowired
     private LoanHomevisitPrepService loanHomevisitPrepService;
     @Autowired
     private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
@@ -644,12 +652,15 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         if (loanHomeVisitInvestigateInitCustomerVo == null) {
             loanHomeVisitInvestigateInitCustomerVo = new LoanHomeVisitInvestigateInitCustomerVo();
             String saleOrderBorrowerSid = "";
+            String saleOrderSid = "";
             LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
             if (loanHomevisitInvestigate == null) {
                 LoanHomevisitPrep loanHomevisitPrep = loanHomevisitPrepService.fetchBySid(sid);
                 saleOrderBorrowerSid = loanHomevisitPrep.getSaleOrderBorrowerSid();
+                saleOrderSid = loanHomevisitPrep.getSaleOrderSid();
             } else {
                 saleOrderBorrowerSid = loanHomevisitInvestigate.getSaleOrderBorrowerSid();
+                saleOrderSid = loanHomevisitInvestigate.getSaleOrderSid();
             }
             BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(saleOrderBorrowerSid).getData();
             CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
@@ -658,6 +669,19 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber());
             loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
             loanHomeVisitInvestigateInitCustomerVo.setSid(sid);
+            //根据销售订单sid查询是否有挂车或上装
+            List<BusSalesOrderMakeupDetailsVo> salesOrderMakeupDetailsVos = busSalesOrderMakeupFeign.selectTopByOrderSid(saleOrderSid).getData();
+            List<BusSalesOrderTrailerDetailsVo> salesOrderTrailerDetailsVos = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(saleOrderSid).getData();
+            if (salesOrderMakeupDetailsVos != null && salesOrderMakeupDetailsVos.size() > 0){
+                loanHomeVisitInvestigateInitCustomerVo.setSzOrGc("上装");
+                if ("01".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())){
+                    loanHomeVisitInvestigateInitCustomerVo.setIsCompBuy("0");
+                }else if ("02".equals(salesOrderMakeupDetailsVos.get(0).getBuyTypeKey())){
+                    loanHomeVisitInvestigateInitCustomerVo.setIsCompBuy("1");
+                }
+            }else if (salesOrderTrailerDetailsVos != null && salesOrderTrailerDetailsVos.size() > 0){
+                loanHomeVisitInvestigateInitCustomerVo.setSzOrGc("挂车");
+            }
             return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
         }
         //银行卡附件

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -500,9 +500,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         List<BusSalesOrderMakeupDetailsVo> busSalesOrderMakeupDetailsVoList = busSalesOrderMakeupFeign.selectTopByOrderSid(busSalesOrder.getSid()).getData();
         //查询金融方案中挂车信息
         List<String> cljszcghtUrls = new ArrayList<>();
-        if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()) {
-            //生成车辆及上装采购合同
-            cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey);
+        if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0)) {
+            //上装生成车辆及上装采购合同
+            cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey, "sz");
+        }else if (solutionsDetailsVo.isTrailerAmountCb()){
+            //挂车生成车辆及上装采购合同
+            cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey, "gc");
         }
         List<String> gsgddwdbjyUrls = new ArrayList<>();
         if ("0".equals(homeKcCust.getIsSecurity())) {
@@ -1978,7 +1981,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         return urls;
     }
 
-    public List<String> cljszcght(PrintConfirmDto printConfirmDto, String conSetUpKey) {
+    public List<String> cljszcght(PrintConfirmDto printConfirmDto, String conSetUpKey, String type) {
         Map<String, Object> map = new HashMap<>();
         List<SalesOrderVehicle> salesOrderVehicles = printConfirmDto.getSalesOrderVehicles();
         //获取销售订单信息
@@ -2013,23 +2016,34 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(printConfirmDto.getBusSid()).getData();
         //合同补充信息
         HomeKcCust homeKcCust = printConfirmDto.getHomeKcCust();
-        if ("0".equals(homeKcCust.getIsCompBuy())) {
-            //第一种
-            map.put("dyz", "☑");
-            //第二种
-            map.put("dez", "□");
-            //上装成交价/挂车成交价
-            map.put("je", "_____");
-        } else if ("1".equals(homeKcCust.getIsCompBuy())) {
-            //第一种
-            map.put("dyz", "□");
-            //第二种
-            map.put("dez", "☑");
-            //上装成交价/挂车成交价
-            if (topInfo != null) {
-                map.put("je", topInfo.getTopPrice());
-            } else if (solutionsDetailsVo.isTrailerAmountCb()) {
-                map.put("je", solutionsDetailsVo.getTrailerAmount());
+        if ("sz".equals(type)){
+            if ("0".equals(homeKcCust.getIsCompBuy())) {
+                //第一种
+                map.put("dyz", "☑");
+                //第二种
+                map.put("dez", "□");
+                //上装成交价/挂车成交价
+                map.put("je", "_____");
+            }
+        }else if ("gc".equals(type)){
+            if ("0".equals(homeKcCust.getIsCompBuy())) {
+                //第一种
+                map.put("dyz", "☑");
+                //第二种
+                map.put("dez", "□");
+                //上装成交价/挂车成交价
+                map.put("je", "_____");
+            } else if ("1".equals(homeKcCust.getIsCompBuy())) {
+                //第一种
+                map.put("dyz", "□");
+                //第二种
+                map.put("dez", "☑");
+                //上装成交价/挂车成交价
+                if (topInfo != null) {
+                    map.put("je", topInfo.getTopPrice());
+                } else if (solutionsDetailsVo.isTrailerAmountCb()) {
+                    map.put("je", solutionsDetailsVo.getTrailerAmount());
+                }
             }
         }
         List<String> urls = new ArrayList<>();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherVo.java

@@ -26,4 +26,8 @@ public class AppLoanHomeVisitInvestigateInitOtherVo implements Vo {
     private String registDetailAddress;
     @ApiModelProperty("实际经营地址")
     private String realAddress;
+    @ApiModelProperty("是否公司采购")
+    private String caigou;
+    @ApiModelProperty("是否展示公司采购")
+    private Integer showCaigou;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherDto.java

@@ -27,4 +27,6 @@ public class AppLoanHomeVisitInvestigateSaveOtherDto implements Dto {
     private String registDetailAddress;
     @ApiModelProperty("实际经营地址")
     private String realAddress;
+    @ApiModelProperty("是否公司采购(1是，0否)")
+    private String caigou;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -245,6 +245,20 @@ public class LoanHomeVisitInvestigateService {
             appLoanHomeVisitInvestigateInitOtherVo.setMobile2(data.getMobile());
             appLoanHomeVisitInvestigateInitOtherVo.setRegistDetailAddress(data.getAccCompAddress());
             appLoanHomeVisitInvestigateInitOtherVo.setRealAddress(data.getAccCompxAddress());
+            //判断是否有上装或挂车
+            if (StringUtils.isBlank(data.getSzOrGc())){
+                appLoanHomeVisitInvestigateInitOtherVo.setShowCaigou(0);
+            }else if ("上装".equals(data.getSzOrGc())){
+                appLoanHomeVisitInvestigateInitOtherVo.setShowCaigou(2);
+            }else if ("挂车".equals(data.getSzOrGc())){
+                appLoanHomeVisitInvestigateInitOtherVo.setShowCaigou(1);
+            }
+            //初始化显示是否公司采购
+            if ("0".equals(data.getIsCompBuy())){
+                appLoanHomeVisitInvestigateInitOtherVo.setCaigou("1");
+            }else if ("1".equals(data.getIsCompBuy())){
+                appLoanHomeVisitInvestigateInitOtherVo.setCaigou("0");
+            }
         }else {
             return rb.setMsg("请优先完善客户信息");
         }
@@ -257,6 +271,9 @@ public class LoanHomeVisitInvestigateService {
         LoanHomeVisitInvestigateInitCustomerVo data = loanHomevisitInvestigateFeign.getHomeVisitCustomerInfo(dto.getSid()).getData();
         if (data != null){
             BeanUtil.copyProperties(data,loanHomeVisitInvestigateSaveCustomerDto);
+            if ("挂车".equals(data.getSzOrGc()) && StringUtils.isBlank(dto.getCaigou())){
+                return rb.setMsg("请选择挂车或上装是否公司采购");
+            }
             List<LoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel = data.getOtherPersonnel();
             List<LoanHomeVisitInvestigateSaveOtherPeoDto> loanHomeVisitInvestigateSaveOtherPeoDtos = new ArrayList<>();
             if (otherPersonnel != null && otherPersonnel.size() > 0){
@@ -268,11 +285,18 @@ public class LoanHomeVisitInvestigateService {
                 loanHomeVisitInvestigateSaveCustomerDto.setOtherPersonnel(loanHomeVisitInvestigateSaveOtherPeoDtos);
             }
             loanHomeVisitInvestigateSaveCustomerDto.setVehRegis(dto.getIsGK());
+            //是否担保
             if ("0".equals(dto.getIsDb())){
                 loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity("1");
             }else if ("1".equals(dto.getIsDb())){
                 loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity("0");
             }
+            //是否采购
+            if ("0".equals(dto.getCaigou())){
+                loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy("1");
+            }else if ("1".equals(dto.getCaigou())){
+                loanHomeVisitInvestigateSaveCustomerDto.setIsCompBuy("0");
+            }
             loanHomeVisitInvestigateSaveCustomerDto.setAccCompName(dto.getDisName());
             loanHomeVisitInvestigateSaveCustomerDto.setAccCompRegistNum(dto.getRegistNum());
             loanHomeVisitInvestigateSaveCustomerDto.setAccCompContract(dto.getContract());