Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java

@@ -107,4 +107,6 @@ public class BaseInternalPurchaseDetailsVo implements Vo {
     private String orgSidPath; // 申请人组织路径
     @ApiModelProperty("内购车辆列表")
     private List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicles; // 内购车辆列表
+
+    private String orgPath;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -173,6 +173,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         BaseInternalPurchaseDetailsVo baseInternalPurchaseDetailsVo = new BaseInternalPurchaseDetailsVo();
         BaseInternalPurchase entity = fetchBySid(sid);
         BeanUtil.copyProperties(entity, baseInternalPurchaseDetailsVo);
+        baseInternalPurchaseDetailsVo.setOrgPath(entity.getOrgSidPath());
         //调入分公司sid
         String buyerOrgSid = baseInternalPurchaseDetailsVo.getBuyerOrgSid();
         //调出分公司sid
@@ -274,7 +275,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         if (baseInternalPurchase == null) {
             return rb.setMsg("该内购申请单不存在");
         }
-        dto.setOrgSidPath(orgSidPath);
+//        dto.setOrgSidPath(orgSidPath);
         updateBySid(dto.toMap(), dtoSid);
         baseInternalPurchaseVehicleService.delByMainSid(dtoSid);
         for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1979,9 +1979,18 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (params != null) {
             //品牌
             qw.eq("bvm.carBrand", params.getBrandSid());
-            if (StringUtils.isNotBlank(params.getUserSid())) {
+            /*if (StringUtils.isNotBlank(params.getUserSid())) {
                 String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
                 qw.eq("bv.useOrgSid", orgSid);
+            }*/
+            if(StringUtils.isNotBlank(params.getOrgPath())){
+                String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
+                qw.eq("bv.useOrgSid",orgSid);
+            }else{
+                if (StringUtils.isNotBlank(params.getUserSid())) {
+                    String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+                    qw.eq("bv.useOrgSid", orgSid);
+                }
             }
             //品牌
             if (StringUtils.isNotBlank(params.getBrandSid())) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -81,12 +81,25 @@
                      WHERE lbpv.saleVehSid = a1.busVinSid),
                     0
                 ) + IFNULL(
-                        (SELECT SUM(fund)
-                         FROM loan_fund_day
-                         WHERE busSid IN
-                               (SELECT lrpd.sid
-                                FROM loan_repayment_plan_details lrpd
-                                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() and lrpd.busVinSid = a1.busVinSid)),
+                        (SELECT (fjj.reveivableMoney - fjj.m)
+                         FROM (
+                                  SELECT IFNULL((
+                                                    SELECT SUM(subscriptionMoney)
+                                                    FROM anrui_fin.fin_selected_receivables_detailed AS s
+                                                    WHERE s.auditState = '3'
+                                                      AND s.receivablesSid = fj.sid
+                                                ),
+                                                0
+                                             ) AS m,
+                                         fj.*
+                                  FROM (SELECT j.busSid, j.sid, j.reveivableMoney
+                                        FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j
+                                        WHERE j.payCostTitleKey = '006') AS fj
+                              ) AS fjj
+                         WHERE fjj.busSid in (SELECT lrpd.sid
+                                              FROM loan_repayment_plan_details lrpd
+                                              WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE()
+                                                and lrpd.busVinSid = a1.busVinSid)),
                         0
                     )
             ) AS    overdueMoney,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -71,12 +71,25 @@
                      WHERE lbpv.saleVehSid = a1.busVinSid),
                     0
                 ) + IFNULL(
-                        (SELECT SUM(fund)
-                         FROM loan_fund_day
-                         WHERE busSid IN
-                               (SELECT lrpd.sid
-                                FROM loan_repayment_plan_details lrpd
-                                WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() and lrpd.busVinSid = a1.busVinSid)),
+                        (SELECT (fjj.reveivableMoney - fjj.m)
+                         FROM (
+                                  SELECT IFNULL((
+                                                    SELECT SUM(subscriptionMoney)
+                                                    FROM anrui_fin.fin_selected_receivables_detailed AS s
+                                                    WHERE s.auditState = '3'
+                                                      AND s.receivablesSid = fj.sid
+                                                ),
+                                                0
+                                             ) AS m,
+                                         fj.*
+                                  FROM (SELECT j.busSid, j.sid, j.reveivableMoney
+                                        FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j
+                                        WHERE j.payCostTitleKey = '006') AS fj
+                              ) AS fjj
+                         WHERE fjj.busSid in (SELECT lrpd.sid
+                                              FROM loan_repayment_plan_details lrpd
+                                              WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE()
+                                                and lrpd.busVinSid = a1.busVinSid)),
                         0
                     )
             )          AS overdueMoney,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java

@@ -37,4 +37,6 @@ public interface LoanRepurchaseApplyMapper extends BaseMapper<LoanRepurchaseAppl
     int updateFlowFiled(Map<String, Object> map);
 
     int selCountByBusVinSid(@Param("busVinSid") String busVinSid);
+
+    String selFundAllByBusVinSid(@Param("busVinSid") String busVinSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml

@@ -178,4 +178,24 @@
             nodeState != '待提交'
 	    and nodeState != '终止'
     </select>
+    <select id="selFundAllByBusVinSid" resultType="java.lang.String">
+        SELECT
+        SUM(IFNULL((b.reveivableMoney - b.m),0)) as fund
+        FROM
+        (SELECT
+        a.*,
+        IFNULL(( SELECT SUM( subscriptionMoney ) FROM anrui_fin.fin_selected_receivables_detailed AS s WHERE s.auditState = '3' AND s.receivablesSid = a.sid ), 0 ) AS m
+        FROM
+        (
+        SELECT
+        jr.sid,
+        jr.reveivableMoney
+        FROM
+        anrui_fin.fin_uncollected_receivables_detailed_jr AS jr
+        LEFT JOIN loan_repayment_plan_details AS p ON jr.busSid = p.sid
+        WHERE
+        jr.payCostTitleKey = '006'
+        AND p.busVinSid = #{busVinSid}
+        AND p.dueDate &lt;= NOW()) AS a) as b
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -944,6 +944,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         LoanRepurchaseApply loanRepurchaseApply = fetchBySid(sid);
         if (null != loanRepurchaseApply) {
+            String busVinSid = loanRepurchaseApply.getBusVinSid();
             //根据用户查询发起人、发起部门、发起日期为当前日期
             String deptName = "";
             String deptSid = "";
@@ -1038,6 +1039,11 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             LoanSettleCompanyCostVo loanSettleCompanyCostVo = new LoanSettleCompanyCostVo();
             LoanRepurchaseCompanyCostVo companyCostVo = loanRepurchaseCompanyCostService.getByMainSid(sid);
             BeanUtil.copyProperties(companyCostVo, loanSettleCompanyCostVo);
+            //截止当前资金占用费
+            String fundAll = baseMapper.selFundAllByBusVinSid(busVinSid);
+            if (StringUtils.isNotBlank(fundAll)) {
+                loanSettleCompanyCostVo.setFundAll(fundAll);
+            }
             BigDecimal settleAll = new BigDecimal(0); //回购申请中正常合计
             BigDecimal amount = new BigDecimal(0); //回购金额
             if (StringUtils.isNotBlank(companyCostVo.getSettleAll())) {
@@ -1048,6 +1054,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             }
             loanSettleCompanyCostVo.setSettleAll((settleAll.subtract(amount)).toString());
             loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
+            loanSettleApplyDetailsVo.setTrueReduction(true);
+            loanSettleApplyDetailsVo.setBusSid(sid);
         }
         return rb.success().setData(loanSettleApplyDetailsVo);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

@@ -94,7 +94,7 @@
     </select>
 
     <select id="selectZjzyf" resultType="java.lang.String">
-        SELECT IFNULL(SUM(fund), 0)
+        <!--SELECT IFNULL(SUM(fund), 0)
         FROM loan_fund_day
         WHERE busSid IN (
             SELECT lrpd.sid
@@ -102,7 +102,26 @@
             WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt;
                   #{settingDate}
               AND lrpd.busVinSid =
-                  #{busVinSid})
+                  #{busVinSid})-->
+        SELECT ifnull((fjj.reveivableMoney - fjj.m), 0)
+        FROM (
+                 SELECT IFNULL((
+                                   SELECT SUM(subscriptionMoney)
+                                   FROM anrui_fin.fin_selected_receivables_detailed AS s
+                                   WHERE s.auditState = '3'
+                                     AND s.receivablesSid = fj.sid
+                               ),
+                               0
+                            ) AS m,
+                        fj.*
+                 FROM (SELECT j.busSid, j.sid, j.reveivableMoney
+                       FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j
+                       WHERE j.payCostTitleKey = '006') AS fj
+             ) AS fjj
+        WHERE fjj.busSid in (SELECT lrpd.sid
+                             FROM loan_repayment_plan_details lrpd
+                             WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; #{settingDate}
+                               and lrpd.busVinSid = #{busVinSid})
     </select>
 
     <select id="selectGsYqYh" resultType="java.lang.String">