Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.fin.api.finbillapplication;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -32,6 +33,9 @@ public class VinListVos {
     private String certificateStateKey; // 合格证状态key
     @ApiModelProperty("合格证状态value")
     private String certificateState; // 合格证状态value
+    @ApiModelProperty("信审终审状态")
+    @JsonProperty("xSState")
+    private String xSState;
     @ApiModelProperty("主车合格证照片")
     private List<String> zcHgzImages = new ArrayList<>();
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.fin.api.finbillvehicle;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -80,5 +81,6 @@ public class FinBillVehicle extends BaseEntity {
     @ApiModelProperty("开票信息")
     private String openTickRemarks; // 开票信息
     @ApiModelProperty("信审终审状态")
+    @JsonProperty("xSState")
     private String xSState;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java

@@ -87,6 +87,10 @@ public class FinBillVehicleDto implements Dto {
     @ApiModelProperty("开票信息")
     private String openTickRemarks; // 开票信息
 
+    @ApiModelProperty("信审终审状态")
+    @JsonProperty("xSState")
+    private String xSState;
+
     @ApiModelProperty("主车合格证照片")
     private List<String> zcHgzImages = new ArrayList<>();
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml

@@ -178,7 +178,8 @@
             bv.`linkNo` AS vin,
             bv.`linkSid` AS vinSid,
             bc.`certificateState` AS certificateStateKey,
-            bc.`certificateStateValue` AS certificateState
+            bc.`certificateStateValue` AS certificateState,
+            lr.`capCarefulResult` AS xSState
         FROM
             anrui_buscenter.`bus_sales_order_vehicle` bv
                 JOIN anrui_buscenter.`bus_sales_order` bo
@@ -189,6 +190,8 @@
                      ON bv.`linkSid` = bc.`vehicleSid`
                 JOIN anrui_buscenter.`bus_sales_order_model` bm
                      ON bv.`salesOrderSid` = bm.`salesOrderSid`
+                LEFT JOIN anrui_riskcenter.`loan_capital_credit_result` lr
+                    ON bv.`loanContractSid` = lr.`loanContractSid`
         where bo.contractNo = #{contractNo} and bv.linkSid = #{vinSid}
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -4655,8 +4655,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean<BillApplicationIInfoVoss> rb = ResultBean.fireFail();
         BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss();
         BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId);
-        ResultBean<BusSalesOrderDetailsVo> resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid());
-        BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData();
         billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
         if("1".equals(busSalesOrder.getPayTypeKey())){
             billApplicationIInfoVoss.setIsCanEdit(true);

anrui-riskcenter-ui/src/views/loandatareview/loandatareviewAdd.vue

@@ -99,7 +99,7 @@
         </div>
         <el-row>
           <el-col :span="24">
-            <div class="span-sty">融资合同</div>
+            <div class="span-sty">融资合同(压缩包文件)</div>
             <el-form-item>
               <div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
                 <upload ref="upload" :accept="'.rar, application/zip, application/x-zip-compressed, application/x-rar-compressed'" v-model="image_list5" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineQuery.java

@@ -77,6 +77,7 @@ public class LoanHomevisitFileexamineQuery implements Query {
     private String homeVisStaffName;
     @ApiModelProperty("组织全路径")
     private String orgSidPath;
+    private String orgPath;
     private String menuUrl;
     private String type;
     private String names;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -110,13 +110,13 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
         if (StringUtils.isNotBlank(query.getMenuUrl())) {
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-            privilegeQuery.setOrgPath(query.getOrgSidPath());
+            privilegeQuery.setOrgPath(query.getOrgPath());
             privilegeQuery.setMenuUrl(query.getMenuUrl());
             privilegeQuery.setUserSid(query.getUserSid());
             ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
             if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
                 //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-                String orgSidPath = query.getOrgSidPath();
+                String orgSidPath = query.getOrgPath();
                 orgSidPath = orgSidPath + "/";
                 int i1 = orgSidPath.indexOf("/");
                 int i2 = orgSidPath.indexOf("/", i1 + 1);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@@ -91,4 +91,6 @@ public class BillApplicationIInfoVo implements Vo {
     private Boolean showValueCustomer;
     @ApiModelProperty("是否为单独新增")
     private Boolean showBtn;
+    @ApiModelProperty("是否显示信审终审")
+    private Boolean showXsState = false;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/SelBillZcVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.invoiced;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +19,7 @@ public class SelBillZcVo implements Vo {
     @ApiModelProperty("合格证状态value")
     private String certificateState;
     @ApiModelProperty("信审终审状态")
+    @JsonProperty("xSState")
     private String xSState;
     @ApiModelProperty("主车合格证图片")
     private List<String> zcHgzImages;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java

@@ -28,5 +28,6 @@ public class VinListDto implements Dto {
     @ApiModelProperty("合格证状态value")
     private String certificateState; // 合格证状态value
     @ApiModelProperty("信审终审状态")
+    @JsonProperty("xSState")
     private String xSState;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java

@@ -32,6 +32,7 @@ public class VinListVo implements Vo {
     @ApiModelProperty("合格证状态value")
     private String certificateState; // 合格证状态value
     @ApiModelProperty("信审终审状态")
+    @JsonProperty("xSState")
     private String xSState;
     @ApiModelProperty("主车合格证照片")
     private List<String> zcHgzImages = new ArrayList<>();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -204,6 +204,7 @@ public class InvoicedService {
             vo.setInvoiceStateKey("001");
             vo.setInvoiceState("正常开票");
             vo.setDate(DateUtil.formatDate(new Date()));
+            vo.setShowXsState(true);
             return rb.success().setData(vo);
         }
         ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid());
@@ -252,7 +253,10 @@ public class InvoicedService {
             vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
             vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
             vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
+            if (StringUtils.isNotBlank(finBillVehicle.getXSState())){
                 vinListVo.setXSState(finBillVehicle.getXSState());
+                vo.setShowXsState(true);
+            }
             vinListVos.add(vinListVo);
         }
         vo.setVinList(vinListVos);
@@ -541,6 +545,7 @@ public class InvoicedService {
             finBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid());
             finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
             finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo());
+            finBillVehicleDto.setXSState(vinListDto.getXSState());
             finBillVehicleDtos.add(finBillVehicleDto);
         }
         finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos);