Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -552,7 +552,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                             //已逾期
                             dto2.setSummary("收" + voucherDetail.getCustomerName() + "累欠");
                             dto2.setSubjectNo("1201.02.03");
-                        } else if (voucherDetail.getSceneCode().equals(SceneCodeEnum.INDIRECT_VOUCHER3.getCode())){
+                        } else if (voucherDetail.getSceneCode().equals(SceneCodeEnum.INDIRECT_VOUCHER3.getCode())) {
                             dto2.setSummary("收" + voucherDetail.getCustomerName() + "月还");
                             dto2.setSubjectNo("1201.01.00");
                         }
@@ -1006,14 +1006,9 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 String month = split[1];
                 String m = "";
                 if (voucherDetail.getTimeFlag().equals("0")) {
-                    if (month.equals("01")) {
-                        m = "12";
-                    } else {
-                        m = String.valueOf(Integer.parseInt(month) - 1);
-                    }
-                } else if (voucherDetail.getTimeFlag().equals("1")) {
-                    m = String.valueOf(Integer.parseInt(month));
+                    newVoucher.setBussDate(sdf.format(voucherDetail.getDataTime()));
                 }
+                m = String.valueOf(Integer.parseInt(month));
                 if (voucherDetail.getSceneCode().equals("借方")) {
                     Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
                     dto1.setSummary("计提" + m + "月逾期利息");

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java

@@ -33,7 +33,11 @@ public class VoucherService extends FinKingDeeService {
         map_fEntityModel_.put("FAccountBookID", voucher.getAccountBook());
         //业务日期
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        map_fEntityModel_.put("FDate", sdf.format(new Date()));
+        if (StringUtils.isNotBlank(voucher.getBussDate())) {
+            map_fEntityModel_.put("FDate", voucher.getBussDate());
+        } else {
+            map_fEntityModel_.put("FDate", sdf.format(new Date()));
+        }
         //凭证字
         map_fEntityModel_.put("FVOUCHERGROUPID", "PZZ34");
         List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = voucher.getResultDetails() == null ? new ArrayList<>() : voucher.getResultDetails();

anrui-riskcenter-ui/src/views/customerrepayment/customerrepayment.vue

@@ -101,14 +101,14 @@
               </template>
             </el-table-column>
             <el-table-column prop="paymentMoney" label="公司垫款余额" width="120" align="center" />
-            <el-table-column prop="bankBeInter" label="垫资方逾期利息余额" width="150" align="center" />
-            <el-table-column prop="fund" label="资金占用费余额" width="130" align="center" />
+            <el-table-column prop="bankBeInter" label="垫资方逾期利息余额" width="160" align="center" />
+            <el-table-column prop="fund" label="资金占用费余额" width="140" align="center" />
             <el-table-column label="当前是否逾期" width="120" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.nowOverdue == '0' ? '是' : scope.row.nowOverdue == '1' ? '否' : '' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="本期是否曾逾期" width="130" align="center">
+            <el-table-column label="本期是否曾逾期" width="140" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.dueOverdue == '0' ? '是' : scope.row.dueOverdue == '1' ? '否' : '' }}</span>
               </template>
@@ -391,9 +391,9 @@ export default {
                   e.nowOverdue = '1'
                 } else {
                   if ((parseFloat(e.outstandingMoney !== '' ? e.outstandingMoney : 0) + parseFloat(e.bankBeInter !== '' ? e.bankBeInter : 0) + parseFloat(e.fund !== '' ? e.fund : 0)) > 0) {
-                    e.nowOverdue = '1'
-                  } else {
                     e.nowOverdue = '0'
+                  } else {
+                    e.nowOverdue = '1'
                   }
                 }
               } else {

anrui-riskcenter-ui/src/views/settle/settleAdd.vue

@@ -386,7 +386,7 @@ export default {
     calculateProfit() {
       let profit = '0'
       // 结清利润 = 公司结清相关费用（资方逾期利息 + 名义价 + 合同违约金 + 公司其他费用） - 资方结清相关费用（资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收）+ 未到期利息差（公司未到期金额 - 资方未到期金额）
-      profit = Math.round((parseFloat(profit) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) - parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice)))) * 100) / 100
+      profit = Math.round(((parseFloat(profit) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable)) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) - parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice)))) * 100) / 100
       // 是否勾选公司结清费用减免情况,为是时需要减去公司其他费用减免，减去公司未到期利息减免
       if (this.formobj.trueReduction) {
         profit = Math.round((parseFloat(profit) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100

anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue

@@ -385,7 +385,7 @@ export default {
     calculateProfit() {
       let profit = '0'
       // 结清利润 = 公司结清相关费用（资方逾期利息 + 名义价 + 合同违约金 + 公司其他费用） - 资方结清相关费用（资方逾期利息 + 资方名义价 + 资方合同违约金 + 资方其他应收）+ 未到期利息差（公司未到期金额 - 资方未到期金额）
-      profit = Math.round((parseFloat(profit) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) - parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice)))) * 100) / 100
+      profit = Math.round(((parseFloat(profit) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankOverInterest === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankOverInterest) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyNominalPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyNominalPrice) + parseFloat(this.formobj.loanSettleCompanyCostVo.contractLiquidated === '' ? 0 : this.formobj.loanSettleCompanyCostVo.contractLiquidated) + parseFloat(this.formobj.loanSettleCompanyCostVo.companyOtherPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.loanSettleBankCostVo.bankInterest === '' ? 0 : this.formobj.loanSettleBankCostVo.bankInterest) + parseFloat(this.formobj.loanSettleBankCostVo.bankNominalPrice === '' ? 0 : this.formobj.loanSettleBankCostVo.bankNominalPrice) + parseFloat(this.formobj.loanSettleBankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.loanSettleBankCostVo.bankContractLiquidated) + parseFloat(this.formobj.loanSettleBankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.loanSettleBankCostVo.bankOtherReceivable)) + (parseFloat(this.formobj.loanSettleCompanyCostVo.bankNotPrice === '' ? 0 : this.formobj.loanSettleCompanyCostVo.bankNotPrice) - parseFloat(this.formobj.loanSettleBankCostVo.notDuePrice === '' ? 0 : this.formobj.loanSettleBankCostVo.notDuePrice)))) * 100) / 100
       // 是否勾选公司结清费用减免情况,为是时需要减去公司其他费用减免，减去公司未到期利息减免
       if (this.formobj.trueReduction) {
         profit = Math.round((parseFloat(profit) - parseFloat(this.formobj.loanSettleCompanyReductionVo.otherCost === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.otherCost) - parseFloat(this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief === '' ? 0 : this.formobj.loanSettleCompanyReductionVo.notDuePriceRelief)) * 100) / 100

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

@@ -660,20 +660,42 @@
     </select>
     <select id="exportStatisticsExcel"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.RecordCountVo">
-        SELECT
-        a.*,
+        SELECT * FROM
         (SELECT
-        (fjj.reveivableMoney - fjj.m)
+        c.*,
+        CASE
+        WHEN c.dueDate > c.updateDate or c.updateDate IS NULL THEN '否'
+        WHEN  c.dueDate &lt;= c.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(c.bankBeInter,0)) > 0 THEN '是'
+        WHEN  c.dueDate &lt;= c.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(c.bankBeInter,0)) &lt;= 0 THEN '否'
+        END AS nowOverdue
         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,
+        (
+        SELECT
+        b.*,
+        (
+        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 = a.sid) as fund
+        ( 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 = b.sid
+        ) AS fund
         FROM
         (
         SELECT
@@ -693,7 +715,7 @@
         pd.borrowerName,
         pd.period,
         pd.paymentMoney,
-        pd.paymentInterest as bankBeInter,
+        pd.paymentInterest AS bankBeInter,
         pd.dueMoney,
         t.repaidMoney,
         t.outstandingMoney,
@@ -701,42 +723,53 @@
         WHEN pd.overdue = '0' THEN '是'
         WHEN pd.overdue = '1' THEN '否'
         END AS dueOverdue,
-        pd.updateTime as updateDate,
+        pd.updateTime AS updateDate,
         CASE
         WHEN t.repaidMoney = 0 THEN
-        '未还'
-        WHEN t.repaidMoney &gt; 0
-        AND t.repaidMoney &lt; pd.dueMoney THEN '部分还款' WHEN t.repaidMoney &gt; 0
-        AND t.repaidMoney &gt;= pd.dueMoney THEN
-        '已还款'
+        '01'
+        WHEN t.repaidMoney > 0
+        AND t.repaidMoney &lt; pd.dueMoney THEN '02' WHEN t.repaidMoney > 0
+        AND t.repaidMoney &lt;= pd.dueMoney THEN
+        '03'
         END AS returnState
         FROM
         loan_repayment_plan_details AS pd
         LEFT JOIN (
         SELECT
         p.sid,
-        IFNULL((SELECT
+        IFNULL((
+        SELECT
         SUM(
         IFNULL( h.actualMoney, 0 ))
         FROM
         loan_repayment_history AS h
         WHERE
         h.planDetailSid = p.sid
-        AND h.updateState = '1'),0) as repaidMoney
-        ,
+        AND h.updateState = '1'
+        ),
+        0
+        ) AS repaidMoney,
         IFNULL(
-        (p.dueMoney - IFNULL((SELECT
-        SUM(IFNULL( h.actualMoney, 0 ))
+        (
+        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 outstandingMoney
+        ),
+        0
+        )),
+        0
+        ) AS outstandingMoney
         FROM
         loan_repayment_plan_details AS p
         ) AS t ON pd.sid = t.sid
-        ) AS a
+        ) AS b
+        ) c ) a
         <where>
             ${ew.sqlSegment}
         </where>
@@ -922,20 +955,42 @@
     </select>
     <select id="repaymentStatistics2"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsVo">
-        SELECT
-        a.*,
+        SELECT * FROM
         (SELECT
-        (fjj.reveivableMoney - fjj.m)
+        c.*,
+        CASE
+        WHEN c.dueDate > c.updateDate or c.updateDate IS NULL THEN '1'
+        WHEN  c.dueDate &lt;= c.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(c.bankBeInter,0)) > 0 THEN '0'
+        WHEN  c.dueDate &lt;= c.updateDate AND (c.outstandingMoney + IFNULL(c.fund,0) + IFNULL(c.bankBeInter,0)) &lt;= 0 THEN '1'
+        END AS nowOverdue
         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,
+        (
+        SELECT
+        b.*,
+        (
+        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 = a.sid) as fund
+        ( 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 = b.sid
+        ) AS fund
         FROM
         (
         SELECT
@@ -955,18 +1010,18 @@
         pd.borrowerName,
         pd.period,
         pd.paymentMoney,
-        pd.paymentInterest as bankBeInter,
+        pd.paymentInterest AS bankBeInter,
         pd.dueMoney,
         t.repaidMoney,
         t.outstandingMoney,
-        pd.overdue as dueOverdue,
-        pd.updateTime as updateDate,
+        pd.overdue AS dueOverdue,
+        pd.updateTime AS updateDate,
         CASE
         WHEN t.repaidMoney = 0 THEN
         '01'
-        WHEN t.repaidMoney &gt; 0
-        AND t.repaidMoney &lt; pd.dueMoney THEN '02' WHEN t.repaidMoney &gt; 0
-        AND t.repaidMoney &gt;= pd.dueMoney THEN
+        WHEN t.repaidMoney > 0
+        AND t.repaidMoney &lt; pd.dueMoney THEN '02' WHEN t.repaidMoney > 0
+        AND t.repaidMoney &lt;= pd.dueMoney THEN
         '03'
         END AS returnState
         FROM
@@ -974,28 +1029,39 @@
         LEFT JOIN (
         SELECT
         p.sid,
-        IFNULL((SELECT
+        IFNULL((
+        SELECT
         SUM(
         IFNULL( h.actualMoney, 0 ))
         FROM
         loan_repayment_history AS h
         WHERE
         h.planDetailSid = p.sid
-        AND h.updateState = '1'),0) as repaidMoney
-        ,
+        AND h.updateState = '1'
+        ),
+        0
+        ) AS repaidMoney,
         IFNULL(
-        (p.dueMoney - IFNULL((SELECT
-        SUM(IFNULL( h.actualMoney, 0 ))
+        (
+        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 outstandingMoney
+        ),
+        0
+        )),
+        0
+        ) AS outstandingMoney
         FROM
         loan_repayment_plan_details AS p
         ) AS t ON pd.sid = t.sid
-        ) AS a
+        ) AS b
+        ) c ) a
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -1473,6 +1473,9 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getDueOverdue())) {
             qw.eq("a.dueOverdue", pagerQuery.getDueOverdue());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getNowOverdue())) {
+            qw.eq("a.nowOverdue", pagerQuery.getNowOverdue());
+        }
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
         qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
@@ -1923,6 +1926,15 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             }
             qw.eq("a.dueOverdue", query);
         }
+        if (StringUtils.isNotBlank(pagerQuery.getNowOverdue())) {
+            String query = "";
+            if (pagerQuery.getNowOverdue().equals("0")) {
+                query = "是";
+            } else if (pagerQuery.getNowOverdue().equals("1")) {
+                query = "否";
+            }
+            qw.eq("a.nowOverdue", query);
+        }
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
         qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
@@ -1939,52 +1951,52 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                 .orderBy(true, true, "a.loanContractNo")
         ;
         List<RecordCountVo> records = baseMapper.exportStatisticsExcel(qw);
-        records.removeAll(Collections.singleton(null));
-        int id = 1;
-        if (!records.isEmpty()) {
-            for (RecordCountVo record : records) {
-                if (StringUtils.isNotBlank(record.getUpdateDate())) {
-                    try {
-                        Date u = sdf.parse(record.getUpdateDate());
-                        Date d = sdf.parse(record.getDueDate());
-                        if (d.compareTo(u) <= 0) {
-                            BigDecimal sum = new BigDecimal(0);
-                            if (StringUtils.isNotBlank(record.getOutstandingMoney())) {
-                                sum = new BigDecimal(record.getOutstandingMoney());
-                            }
-                            if (StringUtils.isNotBlank(record.getFund())) {
-                                sum = sum.add(new BigDecimal(record.getFund()));
-                            }
-                            if (StringUtils.isNotBlank(record.getBankBeInter())) {
-                                sum = sum.add(new BigDecimal(record.getBankBeInter()));
-                            }
-                            if (sum.compareTo(BigDecimal.ZERO) > 0) {
-                                record.setNowOverdue("是");
-                            } else {
-                                record.setNowOverdue("否");
-                            }
-                        } else {
-                            record.setNowOverdue("否");
-                        }
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
-                } else {
-                    record.setNowOverdue("否");
-                }
-                record.setRankNo(id);
-                id = id + 1;
-            }
-        }
-        if (StringUtils.isNotBlank(pagerQuery.getNowOverdue())) {
-            if (pagerQuery.getNowOverdue().equals("0")) {
-                records = records.stream().filter(r -> r.getNowOverdue().equals("是"))
-                        .collect(Collectors.toList());
-            } else if (pagerQuery.getNowOverdue().equals("1")) {
-                records = records.stream().filter(r -> r.getNowOverdue().equals("否"))
-                        .collect(Collectors.toList());
-            }
-        }
+//        records.removeAll(Collections.singleton(null));
+//        int id = 1;
+//        if (!records.isEmpty()) {
+//            for (RecordCountVo record : records) {
+//                if (StringUtils.isNotBlank(record.getUpdateDate())) {
+//                    try {
+//                        Date u = sdf.parse(record.getUpdateDate());
+//                        Date d = sdf.parse(record.getDueDate());
+//                        if (d.compareTo(u) <= 0) {
+//                            BigDecimal sum = new BigDecimal(0);
+//                            if (StringUtils.isNotBlank(record.getOutstandingMoney())) {
+//                                sum = new BigDecimal(record.getOutstandingMoney());
+//                            }
+//                            if (StringUtils.isNotBlank(record.getFund())) {
+//                                sum = sum.add(new BigDecimal(record.getFund()));
+//                            }
+//                            if (StringUtils.isNotBlank(record.getBankBeInter())) {
+//                                sum = sum.add(new BigDecimal(record.getBankBeInter()));
+//                            }
+//                            if (sum.compareTo(BigDecimal.ZERO) > 0) {
+//                                record.setNowOverdue("是");
+//                            } else {
+//                                record.setNowOverdue("否");
+//                            }
+//                        } else {
+//                            record.setNowOverdue("否");
+//                        }
+//                    } catch (ParseException e) {
+//                        e.printStackTrace();
+//                    }
+//                } else {
+//                    record.setNowOverdue("否");
+//                }
+//                record.setRankNo(id);
+//                id = id + 1;
+//            }
+//        }
+//        if (StringUtils.isNotBlank(pagerQuery.getNowOverdue())) {
+//            if (pagerQuery.getNowOverdue().equals("0")) {
+//                records = records.stream().filter(r -> r.getNowOverdue().equals("是"))
+//                        .collect(Collectors.toList());
+//            } else if (pagerQuery.getNowOverdue().equals("1")) {
+//                records = records.stream().filter(r -> r.getNowOverdue().equals("否"))
+//                        .collect(Collectors.toList());
+//            }
+//        }
         return records;
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -637,7 +637,7 @@
                                  SUM(j.reveivableMoney) as reveivableMoney
                           FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j
                                    LEFT JOIN loan_repayment_plan_details AS p ON j.busSid = p.sid
-                          WHERE j.payCostTitleKey = '006' AND j.isEnable != 3
+                          WHERE j.payCostTitleKey = '006'
                           GROUP BY p.busVinSid
                          ) as a) as b
               WHERE b.reveivableMoney - b.fund > 0

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java

@@ -187,7 +187,12 @@ public class ScheduledRepaymentPlanDetailsService {
         List<String> useOrgSidList = loanRepaymentPlanDetailsService.selUseOrgSidListForFundVoucher();
         useOrgSidList.removeAll(Collections.singleton(null));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+        //取今天日期,如果日期类型为String类型,可以使用df.parse()方法,转换为Date类型
+        Date date = new Date();
+        Calendar calendar = Calendar.getInstance();//new一个Calendar类,把Date放进去
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE, -1);
+        Date time = calendar.getTime();
         if (!useOrgSidList.isEmpty()) {
             for (String u : useOrgSidList) {
                 List<LoanPlanDetailsVoForFundVoucher> fundVouchers = loanRepaymentPlanDetailsService.getFundForVoucher(u);
@@ -206,7 +211,7 @@ public class ScheduledRepaymentPlanDetailsService {
                     }
                     GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
                     voucherDetail1.setSceneCode("贷方");
-                    voucherDetail1.setDataTime(new Date());
+                    voucherDetail1.setDataTime(time);
                     voucherDetail1.setAmount(result);
                     voucherDetail1.setTimeFlag("0");
                     List<SysOrganizationVo> deptVo = sysOrganizationFeign.selectChildrenListBySid(u).getData();
@@ -226,7 +231,7 @@ public class ScheduledRepaymentPlanDetailsService {
                             GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                             voucherDetail.setSceneCode("借方");
                             voucherDetail.setTimeFlag("0");
-                            voucherDetail.setDataTime(new DateTime());
+                            voucherDetail.setDataTime(time);
                            String cwDeptCode = loanRepaymentPlanDetailsService.fetchCwDeptCodeByBusVinSid(v.getBusVinSid());
                             if (StringUtils.isNotBlank(cwDeptCode)) {
                                 voucherDetail.setDeptCode(cwDeptCode);

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

@@ -2829,7 +2829,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String settingDate = loanSettleApply.getSettingDate();
         String formatDate = DateUtil.formatDate(new Date());
         boolean settle = isSettle(loanSettleApply);
-        if (!settle) {
+        if (settle) {
             return rb.setMsg("结清款尚未认款完毕，请继续认款！");
         }
         if (formatDate.compareTo(settingDate) > 0) {
@@ -2850,7 +2850,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     }
 
     public boolean isSettle(LoanSettleApply loanSettleApply) {
-        boolean isSettle = true;
+        boolean isSettle = false;
         String busVinSid = loanSettleApply.getBusVinSid();
         BigDecimal sumMoney = BigDecimal.ZERO;
         BigDecimal dueMoney = BigDecimal.ZERO; //月还
@@ -2859,9 +2859,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         Date closeDate = loanSettleApply.getCloseDate();
         String formatDate = sdf.format(closeDate);
         String jMoney = baseMapper.selJrMoneyByBusVinSidAndCloseDate(busVinSid, formatDate);
-        jrMoney = new BigDecimal(jMoney);
+        if (StringUtils.isNotBlank(jMoney)) {
+            jrMoney = new BigDecimal(jMoney);
+        }
         String dMoney = baseMapper.selDueMoneyByBusVinSidAndCloseDate(busVinSid, formatDate);
-        dueMoney = new BigDecimal(dMoney);
+        if (StringUtils.isNotBlank(dMoney)) {
+            dueMoney = new BigDecimal(dMoney);
+        }
         sumMoney = jrMoney.add(dueMoney);
         //获取公司减免情况
         BigDecimal amountTo = BigDecimal.ZERO;
@@ -2881,7 +2885,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             }
         }
         if (sumMoney.compareTo(amountTo) < 0) {
-            isSettle = false;
+            isSettle = true;
         }
         return isSettle;
     }

yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@@ -373,7 +373,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.count === null ? '0' : e.count !== '' ? e.count : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
           }
         })
       }
@@ -385,7 +385,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            cg = Math.round((parseFloat(cg) + parseFloat(e.amount === null ? '0' : e.amount !== '' ? e.amount : '0')) * 100) / 100
+            cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
           }
         })
       }

yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@@ -389,7 +389,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            sl = Math.round((parseFloat(sl) + parseFloat(e.count === null ? '0' : e.count !== '' ? e.count : '0')) * 100) / 100
+            sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
           }
         })
       }
@@ -401,7 +401,7 @@ export default {
       if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
         this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
           if (e.goodsSpuName !== '') {
-            cg = Math.round((parseFloat(cg) + parseFloat(e.amount === null ? '0' : e.amount !== '' ? e.amount : '0')) * 100) / 100
+            cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
           }
         })
       }