Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java

@@ -67,7 +67,7 @@ public class AppDeliveredDetailsVo implements Vo {
     @ApiModelProperty("orgPath")
     private String orgPath;
     @ApiModelProperty("车辆集合")
-    private List<AppCarListVo> carList;
+    private List<AppCarListVo> carList = new ArrayList<>();
     @ApiModelProperty(value = "实例id")
     private String procInstId;
     @ApiModelProperty(value = "任务id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppVinListVo.java

@@ -26,5 +26,9 @@ public class AppVinListVo implements Vo {
     @ApiModelProperty("资料是否齐全：0未齐全/1已齐全")
     private String zlState;
 
+    private String loanSid;
+
+    private String loanName;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java

@@ -64,5 +64,7 @@ public class BusDeliveredQuery implements Query {
     private String userSid;
     @ApiModelProperty("车辆sid集合")
     private List<String> vinSid = new ArrayList<>();
+    @ApiModelProperty("贷款人sid")
+    private String loanSid;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java

@@ -75,5 +75,8 @@ public class BusDeliveredVo implements Vo {
     @ApiModelProperty("资料是否齐全：0未齐全/1已齐全")
     private String zlState;
 
+    private String loanName;
+    private String loanSid;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/AppCarListVo.java

@@ -36,5 +36,8 @@ public class AppCarListVo implements Vo {
     @ApiModelProperty("欠款领票sid")
     private String qkLpSid;
 
+    private String loanSid;
+    private String loanName;
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -286,7 +286,9 @@
         bo.payType paymentMethod,
         RIGHT(bv.linkNo, 8) as vinNo,
         bv.linkSid vinSid,
-        bv.sid busVinSid
+        bv.sid busVinSid,
+        bv.borrowName loanName,
+        bv.borrowerSid loanSid
         FROM
         bus_sales_order bo
         LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
@@ -434,7 +436,7 @@
         left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
             left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}  and bbv.vehicleState != '0002'-->
-        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
+        select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin,bv.borrowerSid loanSid,bv.borrowName loanName
         FROM
         bus_sales_order bo
         LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -198,6 +198,9 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             if (StringUtils.isNotBlank(query.getUserSid())) {
                 qw.eq("bo.createBySid", query.getUserSid());
             }
+            if(StringUtils.isNotBlank(query.getLoanSid())){
+                qw.eq("bv.borrowerSid",query.getLoanSid());
+            }
         }
         IPage<BusDelivered> page = PagerUtil.queryToPage(pq);
         IPage<BusDeliveredVo> pagging = baseMapper.selectListsVoNew(page, qw);
@@ -428,6 +431,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid);
                 AppCarListVo appCarListVo = new AppCarListVo();
                 appCarListVo.setVinSid(list.get(i));
+                appDeliveredDetailsVo.setLoanSid(busSalesOrderVehicle.getBorrowerSid());
+                appDeliveredDetailsVo.setLoanName(busSalesOrderVehicle.getBorrowName());
                 //查询该车辆是否有挂车
                 ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, contractNo);
                 if (trailerList.getData() != null && trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
@@ -580,6 +585,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                     AppCarListVo appCarListVo = new AppCarListVo();
                     appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
                     appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
+                    appDeliveredDetailsVo.setLoanName(busSalesOrderVehicle.getBorrowName());
+                    appDeliveredDetailsVo.setLoanSid(busSalesOrderVehicle.getBorrowerSid());
                     //查询该车辆是否有挂车
                     ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
                     if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
@@ -801,6 +808,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
                 }
             } else {
                 appCarListVo.setVinSid(vinSid);
+                appCarListVo.setLoanSid(busSalesOrderVehicle.getBorrowerSid());
+                appCarListVo.setLoanName(busSalesOrderVehicle.getBorrowName());
             }
             ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid, query.getContractNo());
             if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java

@@ -85,4 +85,6 @@ public class FinUncollectedReceivablesDetailedQuery implements Query {
     private List<String> busVinSids;
 
     private String menuUrl;
+    @ApiModelProperty("0销售专员申请，1内勤申请")
+    private String state;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1729,12 +1729,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         bigAdd = bigAdd.add(loanSolutionsDetail.getBondAmounts());
                     }
                     if(loanSolutions.getFactoryDiscount() != null){
-                        bigAdd = bigAdd.add(loanSolutions.getFactoryDiscount());
+                        bigAdd = bigAdd.add(loanSolutions.getActualDiscount());
                     }
 
                     if(loanSolutionsOtherpolicy != null){
                         if(loanSolutionsOtherpolicy.getOtherDiscount() != null){
-                            bigAdd = bigAdd.add(loanSolutionsOtherpolicy.getOtherDiscount());
+                            bigAdd = bigAdd.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
                         }
                     }
 
@@ -1770,9 +1770,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 loanDiffDetailssDto.setMakeLoan(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
                                 loanDiffDetailssDto.setRealityLoan(finSelectedReceivablesDetailed.getSubscriptionMoney());
                                 loanDiffDetailssDto.setDiffLoan(decimalAll);
-                                loanDiffDetailssDto.setMakeDiscount(loanSolutions.getFactoryDiscount());
+                                loanDiffDetailssDto.setMakeDiscount(loanSolutions.getActualDiscount());
                                 loanDiffDetailssDto.setMakeLoanMargin(loanSolutions.getBondAmount());
-                                loanDiffDetailssDto.setMakeOtherDiscount(loanSolutionsOtherpolicy.getOtherDiscount());
+                                loanDiffDetailssDto.setMakeOtherDiscount(loanSolutionsOtherpolicy.getOtherActualDiscount());
                                 loanDiffDetailssDto.setReceivedPremium(loanSolutionsDetail.getProxyAccidentPremium());
                                 loanDiffDetailssDto.setVinNo(busSalesOrderVehicle.getLinkNo());
                                 loanDiffDetailssDto.setVinSid(busSalesOrderVehicle.getLinkSid());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -65,6 +65,7 @@
         ) df ON df.receivablesSid = furd.`sid`
         <where>
             ${ew.sqlSegment}
+            and furd.receivablesName not like '%融资放款%'
             <if test="name != null and name != ''">
                 and concat(IFNULL(furd.customerName
                 , '')
@@ -477,7 +478,7 @@
         ) df ON df.receivablesSid = furd.`sid`
         <where>
             ${ew.sqlSegment}
-            and fd.receivablesName not like '%订金%'
+            and (fd.receivablesName not like '%订金%' and fd.receivablesName not like '%融资放款%')
             and fd.auditState = 3
             <if test="name != null and name != ''">
                 and concat(IFNULL(fd.customerName

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -240,6 +240,11 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         } else {
             qw.eq("furd.purchaseSystemSid", "0");
         }
+        if(StringUtils.isNotBlank(query.getState())){
+            if("1".equals(query.getState())){
+                qw.notLike("furd.receivablesName","融资放款");
+            }
+        }
         List<DetailsOfReceivablesAndUncollectedItemsVo> list = baseMapper.selectListAllVo(qw);
         return list;
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/otherreceivablebill/data_model.json

@@ -50,7 +50,7 @@
   "FNOTAXAMOUNT": "0",
   "FTAXAMOUNT": "0",
   "FCancelStatus": "",
-  "FAR_OtherRemarks": "",
+  "FAR_OtherRemarks": "@KD_FAR_OtherRemarks",
   "FScanPoint": {
     "FNUMBER": ""
   },