`修改报送播报`

src/main/java/cn/quantgroup/report/service/baihang/BaiHangZhuDaiService.java

@@ -364,12 +364,6 @@ public class BaiHangZhuDaiService {
         String resMsgTemp = "放款报送:查询 %d条(联合贷%d条), 报送成功 %d条, 存日志 %d条;";
         resMsgTemp += "[" + (loanInfos.size() == succ_atomicInteger.get()) + "]";
         String msg = String.format(resMsgTemp, loanInfos.size(), loanInfosLhSize, succ_atomicInteger.get(), save_atomicInteger.get());
-        ReportResult loanResult = ReportResult.builder()
-                .type(ReportType.LOAN)
-                .successNum(succ_atomicInteger.get())
-                .totalNum(loanInfos.size())
-                .build();
-        dingTalk.talkToLeader("Info","众信利民-百行报送",combineLeaderReport(loanResult,null,startnyr,endnyr));
         return ReportResult.builder().msg(msg).successNum(succ_atomicInteger.get()).totalNum(loanInfos.size()).type(ReportType.LHD_LOAN).build();
     }
 
@@ -523,32 +517,39 @@ public class BaiHangZhuDaiService {
                             .build();
                 }
                 resMsg += "[" + (totail_atomicInt.get() == succ_atomicInt.get()) + "]";
-                dingTalk.talkToLeader("Info","众信利民-百行报送",combineLeaderReport(normalResult,overdueResult,startnyr,endnyr));
             } catch (Exception e) {
                 log.error("量化派助贷TO百行报送-异常 J: {} , 开始时间: {} , 结束时间: {} ", j, startnyr, endnyr, e);
                 dingTalk.talk("Error","量化派助贷TO百行报送-"+(j==0?"还款":"逾期")+"信息异常", e);
                 dingTalk.talk_ToUser("D3报送失败", "量化派助贷TO百行报送-"+(j==0?"还款":"逾期")+"信息异常,请尽快手动处理!");
             }
         }
+        dingTalk.talkToLeader("Info","",combineLeaderReport(normalResult,overdueResult));
         log.info("量化派助贷TO百行报送-实时还款&逾期结束, resMsg: {} ", resMsg);
         return resMsg;
     }
 
-    private static String combineLeaderReport(ReportResult normal,ReportResult overdue,String startDate,String endDate){
+    public static String combineLeaderReport(ReportResult normal,ReportResult overdue){
         try {
-            String rateTemplate = "成功报送-上报总数: %s ,正常还款数: %s ,逾期还款数: %s ,逾期占比: %s";
-            String date = String.format("%s - %s",startDate,endDate);
-            String rate = null;
-            String branch = String.format(branchTemplate,normal.getType().getName(),normal.getTotalNum()
-                    ,normal.getTotalNum() - normal.getSuccessNum(),0);
-            if (overdue != null){
-                int total = normal.getSuccessNum()+overdue.getSuccessNum();
-                rate = String.format(rateTemplate,total
-                        ,normal.getSuccessNum(),overdue.getSuccessNum()
-                        ,new BigDecimal(overdue.getSuccessNum()).divide(new BigDecimal(total),2, RoundingMode.HALF_UP)
-                                .multiply(BigDecimal.valueOf(100)).toString() + "%");
+            String rateTemplate = "上报总数: %s \r\n还款记录: %s \r\n逾期记录: %s \r\n逾期占比: %s";
+            int total = normal.getTotalNum()+overdue.getTotalNum();
+            int successTotal = normal.getSuccessNum()+overdue.getSuccessNum();
+            int failCount = total-successTotal;
+            int skipCount = normal.getSkipNum() + overdue.getSkipNum();
+            String base = String.format(rateTemplate,
+                    total,
+                    normal.getSuccessNum(),
+                    overdue.getSuccessNum(),
+                    new BigDecimal(overdue.getSuccessNum())
+                            .divide(new BigDecimal(successTotal),6, RoundingMode.HALF_UP)
+                            .multiply(BigDecimal.valueOf(100)).toString() + "%"
+                    );
+            if (failCount > 0){
+                base = base + "\r\n失败条数: " + failCount;
             }
-            return String.format(rootTemplate,date,branch,StringUtils.isEmpty(rate)?"":rate);
+            if (skipCount > 0){
+                base = base + "\r\n白名单跳过条数: " + skipCount;
+            }
+            return base;
         }catch (Exception e){
             log.error("talkToLeader出错",e);
             return "";