Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSet.java

@@ -26,8 +26,10 @@ public class ReportSet extends BaseEntity {
     private int buyout;
     @ApiModelProperty("欠款出库")
     private int outbound;
-    @ApiModelProperty("金融未放款")
+    @ApiModelProperty("金融未放款-已出库")
     private int loanDis;
+    @ApiModelProperty("金融未放款-已过信审终审")
+    private int loanDiss;
 
 
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml

@@ -376,17 +376,17 @@
         select DATE_FORMAT(createTime, '%Y-%m-%d') as date,
         <!--sum(SUBSTRING_INDEX(saleOfStockRatio, ':', 1) /
             SUBSTRING_INDEX(saleOfStockRatio, ':', -1)) as saleOfStockRatio,-->
-        sum(saleOfStockRatio)         as saleOfStockRatio,
-        sum(stock_subtotal)           as stock_subtotal,
-        sum(pcOrder_subtotal)         as pcOrder_subtotal,
-        sum(saleOrder_subtotal_day)   as saleOrder_subtotal_day,
-        sum(sale_subtotal_day)        as sale_subtotal_day,
-        sum(arrears_carry_veh_amount) as arrears_carry_veh_amount,
-        sum(loan_not_amount)          as loan_not_amount,
-        sum(loan_not_amounts)         as loan_not_amounts,
-        sum(buyout_day)               as buyout_day,
-        sum(saleAllToThree)           as saleAllToThree,
-        SUM(stock_total)              as stock_total,
+        sum(saleOfStockRatio)            as saleOfStockRatio,
+        sum(stock_subtotal)              as stock_subtotal,
+        sum(pcOrder_subtotal)            as pcOrder_subtotal,
+        sum(saleOrder_subtotal_day)      as saleOrder_subtotal_day,
+        sum(sale_subtotal_day)           as sale_subtotal_day,
+        sum(arrears_carry_veh_amount)    as arrears_carry_veh_amount,
+        sum(loan_not_amount)             as loan_not_amount,
+        ifnull(sum(loan_not_amounts), 0) as loan_not_amounts,
+        sum(buyout_day)                  as buyout_day,
+        sum(saleAllToThree)              as saleAllToThree,
+        SUM(stock_total)                 as stock_total,
         useOrgSid
         from daily_report
         <where>
@@ -405,7 +405,7 @@
                sum(sale_subtotal_day)              as sale_subtotal_day,
                sum(arrears_carry_veh_amount)       as arrears_carry_veh_amount,
                sum(loan_not_amount)                as loan_not_amount,
-               sum(loan_not_amounts)               as loan_not_amounts,
+               ifnull(sum(loan_not_amounts), 0)    as loan_not_amounts,
                sum(buyout_day)                     as buyout_day,
                sum(saleAllToThree)                 as saleAllToThree,
                SUM(stock_total)                    as stock_total,

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java

@@ -62,6 +62,10 @@ public class ReportSetService extends MybatisBaseService<ReportSetMapper, Report
 //                        reportSet.setLoanDis(reportSetVo.isSelected() ? 1 : 0);
                         reportSet.setLoanDis(1);
                         break;
+                    case "loanDiss":
+//                        reportSet.setLoanDis(reportSetVo.isSelected() ? 1 : 0);
+                        reportSet.setLoanDiss(1);
+                        break;
                     default:
                         break;
                 }
@@ -115,9 +119,14 @@ public class ReportSetService extends MybatisBaseService<ReportSetMapper, Report
             list.add(reportSetVo);
             reportSetVo = new ReportSetVo();
             reportSetVo.setDictKey("loanDis");
-            reportSetVo.setDictValue("金融未放款");
+            reportSetVo.setDictValue("金融未放款（已出库）");
             reportSetVo.setSelected(reportSet.getLoanDis() == 1);
             list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("loanDiss");
+            reportSetVo.setDictValue("金融未放款（已过终审）");
+            reportSetVo.setSelected(reportSet.getLoanDiss() == 1);
+            list.add(reportSetVo);
         } else {
             ReportSetVo reportSetVo = new ReportSetVo();
             reportSetVo.setDictKey("stock");
@@ -156,7 +165,12 @@ public class ReportSetService extends MybatisBaseService<ReportSetMapper, Report
             list.add(reportSetVo);
             reportSetVo = new ReportSetVo();
             reportSetVo.setDictKey("loanDis");
-            reportSetVo.setDictValue("金融未放款");
+            reportSetVo.setDictValue("金融未放款（已出库）");
+            reportSetVo.setSelected(false);
+            list.add(reportSetVo);
+            reportSetVo = new ReportSetVo();
+            reportSetVo.setDictKey("loanDiss");
+            reportSetVo.setDictValue("金融未放款（已过终审）");
             reportSetVo.setSelected(false);
             list.add(reportSetVo);
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java

@@ -61,4 +61,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
     int updateTimeByPlanSids(@Param("stringList") List<String> stringList, @Param("formatDate") String formatDate);
 
     List<String> selNotRuleForBuckSids(@Param("useOrgSid") String useOrgSid);
+
+    String selPayStateByPlanSid(@Param("key") String key);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -11,6 +11,7 @@
     </update>
 
 
+
     <select id="updateRecordInfo"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryUpdate">
         SELECT p.loanContractNo as loanContractNo,
@@ -541,5 +542,19 @@
         WHERE
         sumActualMoney &lt;= 0
     </select>
+    <select id="selPayStateByPlanSid" resultType="java.lang.String">
+        SELECT
+            h.payState
+        FROM
+            loan_repayment_history AS h
+        WHERE
+            h.planDetailSid = #{key}
+          AND h.buckleKey != '002'
+        AND h.buckleKey != '003'
+        AND h.updateState = 1
+        ORDER BY
+            h.updateTime DESC
+            LIMIT 1
+    </select>
 
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -905,11 +905,11 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (selNotRuleForBuckSids.isEmpty()) {
             selNotRuleForBuckSids = new ArrayList<>();
         }
-        qw.eq("p.orgSidPath", useOrgSid);
+        qw.eq("p.useOrgSid", useOrgSid);
         qw.ne("h.buckleKey", "002");
         qw.ne("h.buckleKey", "003");
         qw.eq("h.updateState", "1");
-        qw.notIn("h.sid",selNotRuleForBuckSids);
+        qw.notIn("h.sid", selNotRuleForBuckSids);
         List<RepaymentHistoryVoForBuckle> histories = baseMapper.selbuckleNewInitList(qw);
         Map<String, BigDecimal> countMoney = new HashMap<>();
         Map<String, List<String>> sids = new HashMap<>();
@@ -920,8 +920,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (!histories.isEmpty()) {
             histories.stream().forEach(h -> {
                 RepaymentHistoryVoForBuckleNew r = new RepaymentHistoryVoForBuckleNew();
-                if (StringUtils.isNotBlank(h.getPlanDetailSid()) && StringUtils.isNotBlank(h.getPayState())) {
-                    r.setRule(h.getPlanDetailSid() + "!" + h.getPayState());
+                if (StringUtils.isNotBlank(h.getPlanDetailSid())) {
+                    r.setRule(h.getPlanDetailSid());
                 }
                 if (StringUtils.isNotBlank(h.getSid())) {
                     r.setSid(h.getSid());
@@ -931,6 +931,19 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                 }
                 newList.add(r);
             });
+//            histories.stream().forEach(h -> {
+//                RepaymentHistoryVoForBuckleNew r = new RepaymentHistoryVoForBuckleNew();
+//                if (StringUtils.isNotBlank(h.getPlanDetailSid()) && StringUtils.isNotBlank(h.getPayState())) {
+//                    r.setRule(h.getPlanDetailSid() + "!" + h.getPayState());
+//                }
+//                if (StringUtils.isNotBlank(h.getSid())) {
+//                    r.setSid(h.getSid());
+//                }
+//                if (null != h.getActualMoney()) {
+//                    r.setActualMoney(h.getActualMoney());
+//                }
+//                newList.add(r);
+//            });
             if (!newList.isEmpty()) {
                 countMoney = newList.stream()
                         .collect(Collectors.groupingBy(RepaymentHistoryVoForBuckleNew::getRule, CollectorsUtil.summingBigDecimal(RepaymentHistoryVoForBuckleNew::getActualMoney)));
@@ -952,18 +965,21 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         }
         for (Map.Entry<String, List<String>> entry : stringListMap.entrySet()) {
             LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
-            String planSid = "";
-            String payState = "";
-            if (StringUtils.isNotBlank(entry.getKey())) {
-                String[] split = entry.getKey().split("!");
-                planSid = split[0];
-                payState = split[1];
+//            String planSid = "";
+//            String payState = "";
+//            if (StringUtils.isNotBlank(entry.getKey())) {
+//                String[] split = entry.getKey().split("!");
+//                planSid = split[0];
+//                payState = split[1];
+//            }
+            record.setRecordSid(entry.getKey());
+            String payState = baseMapper.selPayStateByPlanSid(entry.getKey());
+            if (StringUtils.isNotBlank(payState)) {
+                record.setPayState(payState);
             }
-            record.setRecordSid(planSid);
-            record.setPayState(payState);
             record.setHistorySids(entry.getValue());
             record.setActualMoney(newMap.get(entry.getKey()).toString());
-            LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(planSid);
+            LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(entry.getKey());
             if (null != planDetails) {
                 if (StringUtils.isNotBlank(planDetails.getLoanContractNo())) {
                     record.setLoanContractNo(planDetails.getLoanContractNo());