Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java

@@ -97,4 +97,6 @@ public class FinPaymentrecordVo implements Vo {
     private String payWayValue;
     @ApiModelProperty("批量处理编码")
     private String batchNumber;
+    @ApiModelProperty("推送财务数据类型（0付款单,1凭证）")
+    private Integer finDataType;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml

@@ -28,7 +28,8 @@
                fp.busRemarks,
                fp.payWayKey,
                fp.payWayValue,
-                fp.batchNumber
+                fp.batchNumber,
+               fp.finDataType
         FROM fin_paymentrecord fp
         LEFT JOIN anrui_portal.sys_organization so ON fp.createOrgSid = so.sid
         <where>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -1025,10 +1025,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         return rb.success();
     }
 
-    private Voucher pushPaymentVoucherReturnVoucher(String busSid, String sid) {
-
-        return null;
-    }
 
     public ApPayBill buildBatchApPayBill(List<ApPayBill> list) {
         ApPayBill apPayBill = new ApPayBill();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml

@@ -54,7 +54,7 @@
     </select>
     <select id="selRepaymentDetailsByDueDate"
             resultType="com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyPlanRecord">
-        SELECT
+        SELECT DISTINCT
         *
         FROM
         (
@@ -71,24 +71,10 @@
         date_format ( p.dueDate, '%Y-%m-%d' ) dueDate,
         p.dueMoney,
         p.dept salesDept,
-        IFNULL(
-        (
-        p.dueMoney - IFNULL((
-        SELECT
-        SUM(
-        IFNULL( h.actualMoney, 0 ))
-        FROM
-        loan_repayment_history AS h
-        WHERE
-        h.planDetailSid = p.sid
-        AND h.updateState = '1'
-        ),
-        0
-        )),
-        0
-        ) AS money
+        v.settleState
         FROM
-        loan_repayment_plan_details p
+        loan_repayment_plan_details as p
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON p.busVinSid = v.sid
         ) a
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@@ -169,7 +169,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
         queryWrapper.apply(StringUtils.isNotEmpty(head), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(last), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
                 );
-        queryWrapper.apply("a.money > 0");
+        queryWrapper.apply("a.settleState != 1");
         records = baseMapper.selRepaymentDetailsByDueDate(queryWrapper);
         records.removeAll(Collections.singleton(null));
         if (!records.isEmpty()) {