Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/SceneCodeEnum.java

@@ -19,6 +19,8 @@ public enum SceneCodeEnum {
     TRANSFER_VOUCHER2("间还月还代付款凭证", "出纳代付款-已垫款（中车类）", "07"),
     PADSINCERE_VOUCHER1("垫款付款凭证", "出纳付款-资方本金（月还）", "08"),
     PADSINCERE_VOUCHER2("垫款付款凭证", "出纳付款-资方逾期利息", "09"),
+    PADSINCERE_VOUCHER3("垫款付款凭证", "出纳付款-资方本金（月还）", "08-02"),
+    PADSINCERE_VOUCHER4("垫款付款凭证", "出纳付款-资方逾期利息", "09-02"),
     FUND_VOUCHER1("资金占用费收款凭证", "资金占用费出纳确认后", "10"),
     FUND_VOUCHER2("资金占用费收款凭证", "资金占用费出纳确认后-确认收入", "11"),
     settle_VOUCHER1("资方结清付款凭证", "资方结清款>0,财务给资方打款-保证金抵顶且保证金>0", "12"),

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

@@ -1809,6 +1809,18 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                     } else if (voucherDetail.getSceneCode().equals(SceneCodeEnum.PADSINCERE_VOUCHER2.getCode())) {
                         dto1.setSummary(voucherDetail.getBankName() + "垫款资方违约金");
                         dto1.setSubjectNo("1201.02.03");
+                    }else{
+                        if (voucherDetail.getSceneCode().equals(SceneCodeEnum.PADSINCERE_VOUCHER3.getCode())) {
+                            dto1.setSummary(voucherDetail.getBankName() + "垫付" + voucherDetail.getCustomerName() + "月还款");
+                            DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(voucherDetail.getBankName(), "investorsCode").getData();
+                            if (null != dictCommonVo) {
+                                dto1.setSubjectNo(dictCommonVo.getDictValue());
+                            }
+                        } else if (voucherDetail.getSceneCode().equals(SceneCodeEnum.PADSINCERE_VOUCHER4.getCode())) {
+                            dto1.setSummary(voucherDetail.getBankName() + "垫款资方违约金");
+                            dto1.setSubjectNo("1201.03.01");
+                        }
+
                     }
                     dto1.setDimensionDept(voucherDetail.getDeptCode());
                     dto1.setDimensionCustom(voucherDetail.getCustomerCode());

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.reportcenter.api.factoryDailyReport;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,14 +21,18 @@ import java.util.Map;
         path = "v1/factoryDailyReport",
         fallback = FactoryDaliyReportFeignFallback.class)
 public interface FactoryDaliyReportFeign {
-    @PostMapping("pageList1")
+    @PostMapping("/pageList")
     @ResponseBody
     ResultBean<FactoryDaliyReportVo> pageList1(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
 
-    @PostMapping("pageList")
+    @PostMapping("/pageList1")
     @ResponseBody
     ResultBean<Map<String, Object>> pageList(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
 
+    @GetMapping("/syb")
+    @ResponseBody
+    ResultBean<SybVo> getSybList();
+
 }
 
 

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/SybVo.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.reportcenter.api.factoryDailyReport;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/5/21
+ **/
+@Data
+public class SybVo {
+
+    private String title;
+
+    private List<YearAllVo> row1;
+
+    private List<String> row2;
+
+    private List<String> row3;
+    private List<String> row4;
+    private List<String> row5;
+    private List<String> row6;
+    private List<String> row7;
+    private List<String> row8;
+    private List<String> row9;
+    private List<String> row10;
+    private List<String> row11;
+
+
+}

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/YearAllVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.reportcenter.api.factoryDailyReport;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/5/21
+ **/
+@Data
+public class YearAllVo {
+
+    private String name;
+
+    private String colspan;
+
+    private String linkSid;
+}

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo;
+import com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,8 @@ public interface FactoryDaliyReportMapper {
     List<FactoryDaliyReportVo> selectRecordList(@Param("map") Map<String, Object> map, @Param(Constants.WRAPPER)QueryWrapper<FactoryDaliyReportVo> qw);
 
     int selectRecordCount(@Param(Constants.WRAPPER)QueryWrapper<FactoryDaliyReportVo> qw);
+
+    List<YearAllVo> getSybNameList();
+
+    List<FactoryDaliyReportVo> getSybList();
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml

@@ -134,4 +134,149 @@
         </where>
         group by year)a where a.year != '' and a.year is not null
     </select>
+
+    <select id="getSybNameList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo">
+        SELECT
+            so.name,
+            so.sid AS linkSid,
+            COUNT(DISTINCT LEFT(date_info.date_str, 4)) AS colspan
+        FROM (
+                 -- 单车返利表
+                 SELECT
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS second_level_org,
+                     palceGenDate AS date_str
+                 FROM anrui_scm.scm_veh_rebate
+                 WHERE orgPath LIKE '%/%/%'
+                   AND palceGenDate IS NOT NULL
+                   AND LEFT(palceGenDate, 4) != '' and LEFT(palceGenDate, 4) is not null
+
+                 UNION ALL
+
+                 -- 专项返利表
+                 SELECT
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS second_level_org,
+                     palceGenDate AS date_str
+                 FROM anrui_scm.scm_special_rebate
+                 WHERE orgPath LIKE '%/%/%'
+                   AND palceGenDate IS NOT NULL
+                   AND LEFT(palceGenDate, 4) != '' and LEFT(palceGenDate, 4) is not null
+
+                 UNION ALL
+
+                 -- 回款返利表
+                 SELECT
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS second_level_org,
+                     collectionDate AS date_str
+                 FROM anrui_scm.scm_collection_rebate
+                 WHERE orgPath LIKE '%/%/%'
+                   AND collectionDate IS NOT NULL
+                   AND LEFT(collectionDate, 4) != '' and LEFT(collectionDate, 4) is not null
+             ) AS date_info
+                 LEFT JOIN anrui_portal.sys_organization so
+                           ON so.sid = date_info.second_level_org
+        GROUP BY date_info.second_level_org, so.name, so.sid
+        ORDER BY date_info.second_level_org DESC;
+
+    </select>
+
+    <select id="getSybList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo">
+        SELECT
+            a.year,
+            a.division_name,
+            ROUND(SUM(a.estimateRebate), 2) AS estimate,
+            ROUND(SUM(a.uploadMoney), 2) AS upload,
+            ROUND(SUM(a.adjustmentMoney), 2) AS adjust,
+            ROUND(SUM(a.notUploadMoney), 2) AS notUploadMoney,
+            ROUND(SUM(a.fee), 2) AS fee,
+            ROUND(SUM(a.expense_payment), 2) AS expense_payment,
+            ROUND(SUM(a.pending_payment), 2) AS pending_payment,
+            ROUND(SUM(a.offset_payment), 2) AS offset_payment,
+            ROUND(SUM(a.remaining_payment), 2) AS remaining_payment,
+            ROUND(SUM(a.unuploaded_rebate), 2) AS unuploaded_rebate
+        FROM (
+                 SELECT
+                     LEFT(palceGenDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
+                         ) AS notUploadMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - (uploadMoney + secondaryUploadMoney)
+                         ) AS unuploaded_rebate,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
+                         onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
+                     SUM(expectTreatCost) AS pending_payment,
+                     SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
+                     SUM(
+                                 estimateRebate - (uploadMoney + secondaryUploadMoney)
+                                 - (onceTreatCost + secondTreatCost + tempTreatCost)
+                                 - expectTreatCost
+                                 - (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
+                         ) AS remaining_payment
+                 FROM anrui_scm.scm_veh_rebate
+                 GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1)
+
+                 UNION ALL
+
+                 SELECT
+                     LEFT(palceGenDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - IFNULL(uploadMoney, 0) - IFNULL(secondaryUploadMoney, 0)
+                         ) AS notUploadMoney,
+                     SUM(
+                                     estimateRebate +
+                                     IFNULL(CASE WHEN isAdjustment = '是' AND adjustmentState = 1 THEN adjustmentMoney ELSE 0 END, 0)
+                                 - (uploadMoney + secondaryUploadMoney)
+                         ) AS unuploaded_rebate,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost + expectTreatCost + expectSuppCost +
+                         onceSuppCost + secondSuppCost + tempSuppCost) AS fee,
+                     SUM(onceTreatCost + secondTreatCost + tempTreatCost) AS expense_payment,
+                     SUM(expectTreatCost) AS pending_payment,
+                     SUM(expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost) AS offset_payment,
+                     SUM(
+                                 estimateRebate - (uploadMoney + secondaryUploadMoney)
+                                 - (onceTreatCost + secondTreatCost + tempTreatCost)
+                                 - expectTreatCost
+                                 - (expectSuppCost + onceSuppCost + secondSuppCost + tempSuppCost)
+                         ) AS remaining_payment
+                 FROM anrui_scm.scm_special_rebate
+                 GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1)
+
+                 UNION ALL
+
+                 SELECT
+                     LEFT(collectionDate, 4) AS year,
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) AS division_name,
+                     SUM(estimateRebate) estimateRebate,
+                     SUM(uploadMoney) uploadMoney,
+                     SUM(adjustmentMoney) adjustmentMoney,
+                     SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - IFNULL(uploadMoney, 0)) AS notUploadMoney,
+                     SUM(estimateRebate + IFNULL(adjustmentMoney, 0) - uploadMoney) AS unuploaded_rebate,
+                     0 AS fee,
+                     0 AS expense_payment,
+                     0 AS pending_payment,
+                     0 AS offset_payment,
+                     SUM(estimateRebate - uploadMoney) AS remaining_payment
+                 FROM anrui_scm.scm_collection_rebate
+                 GROUP BY LEFT(collectionDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1)
+             ) a
+        WHERE a.year IS NOT NULL AND a.year != ''
+        GROUP BY a.year, a.division_name
+        ORDER BY a.division_name desc, a.year DESC;
+
+    </select>
 </mapper>

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.reportcenter.biz.factoryDailyReport;
 import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportFeign;
 import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportQuery;
 import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo;
+import com.yxt.anrui.reportcenter.api.factoryDailyReport.SybVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -38,4 +39,11 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign {
         Map<String,Object> map = factoryDaliyReportService.pageList(pagerQuery);
         return rb.success().setData(map);
     }
+
+    @Override
+    public ResultBean<SybVo> getSybList() {
+        return factoryDaliyReportService.getSybList();
+    }
+
+
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java

@@ -7,11 +7,10 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.reportcenter.api.dailyreport.DailyReport;
 import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportAppPagerQuery;
 import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportListVo;
-import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportQuery;
+import com.yxt.anrui.reportcenter.api.factoryDailyReport.*;
-import com.yxt.anrui.reportcenter.api.factoryDailyReport.FactoryDaliyReportVo;
-import com.yxt.anrui.reportcenter.api.factoryDailyReport.UnUploadVo;
 import com.yxt.anrui.reportcenter.config.DecimalUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -20,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @description:
@@ -158,4 +158,60 @@ public class FactoryDaliyReportService {
         reportMap.put("records", recordList);
         return reportMap;
     }
+
+    public ResultBean<SybVo> getSybList() {
+        ResultBean<SybVo> rb = ResultBean.fireFail();
+        SybVo sysVo = new SybVo();
+        sysVo.setTitle("事业部报表");
+        //先查询有哪些事业部以及事业部下的年份
+        List<YearAllVo> orgNameList = factoryDaliyReportMapper.getSybNameList();
+        List<FactoryDaliyReportVo> factoryDaliyReportVoList = factoryDaliyReportMapper.getSybList();
+        factoryDaliyReportVoList.removeAll(Collections.singleton(null));
+        if(!factoryDaliyReportVoList.isEmpty()){
+            for (int i = 0; i < factoryDaliyReportVoList.size(); i++) {
+                FactoryDaliyReportVo factoryDaliyReportVo = factoryDaliyReportVoList.get(i);
+                factoryDaliyReportVo.setEstimate(DecimalUtil.format(factoryDaliyReportVo.getEstimate()));
+                factoryDaliyReportVo.setUpload(DecimalUtil.format(factoryDaliyReportVo.getUpload()));
+                factoryDaliyReportVo.setAdjust(DecimalUtil.format(factoryDaliyReportVo.getAdjust()));
+                factoryDaliyReportVo.setNotUploadMoney(DecimalUtil.format(factoryDaliyReportVo.getNotUploadMoney()));
+                factoryDaliyReportVo.setUnuploaded_rebate(DecimalUtil.format(factoryDaliyReportVo.getUnuploaded_rebate()));
+                factoryDaliyReportVo.setFee(DecimalUtil.format(factoryDaliyReportVo.getFee()));
+                factoryDaliyReportVo.setExpense_payment(DecimalUtil.format(factoryDaliyReportVo.getExpense_payment()));
+                factoryDaliyReportVo.setPending_payment(DecimalUtil.format(factoryDaliyReportVo.getPending_payment()));
+                factoryDaliyReportVo.setOffset_payment(DecimalUtil.format(factoryDaliyReportVo.getOffset_payment()));
+            }
+            //年份
+            List<String> row2 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getYear).collect(Collectors.toList());
+            //预提
+            List<String> row3 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getEstimate).collect(Collectors.toList());
+            //上传
+            List<String> row4 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUpload).collect(Collectors.toList());
+            //调整
+            List<String> row5 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getAdjust).collect(Collectors.toList());
+            //未上传
+            List<String> row6 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getNotUploadMoney).collect(Collectors.toList());
+            //其中返利
+            List<String> row7 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getUnuploaded_rebate).collect(Collectors.toList());
+            //其中费用
+            List<String> row8 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getFee).collect(Collectors.toList());
+            //支出
+            List<String> row9 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getExpense_payment).collect(Collectors.toList());
+            //待支付
+            List<String> row10 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getPending_payment).collect(Collectors.toList());
+            //抵顶
+            List<String> row11 = factoryDaliyReportVoList.stream().map(FactoryDaliyReportVo::getOffset_payment).collect(Collectors.toList());
+            sysVo.setRow1(orgNameList);
+            sysVo.setRow2(row2);
+            sysVo.setRow3(row3);
+            sysVo.setRow4(row4);
+            sysVo.setRow5(row5);
+            sysVo.setRow6(row6);
+            sysVo.setRow7(row7);
+            sysVo.setRow8(row8);
+            sysVo.setRow9(row9);
+            sysVo.setRow10(row10);
+            sysVo.setRow11(row11);
+        }
+        return rb.success().setData(sysVo);
+    }
 }

anrui-riskcenter-ui/src/api/buyback/buyback.js

@@ -18,6 +18,13 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  createPdf: function(data) {
+    return request({
+      url: '/riskcenter/v1/loanrepurchaseapply/createPdf',
+      method: 'post',
+      params: data
+    })
+  },
   saveOrUpdate: function(data) {
     return request({
       url: '/riskcenter/v1/loanrepurchaseapply/repurchaseSave',

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

@@ -74,6 +74,7 @@
             <el-table-column label="操作" width="180px" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState !='已办结'" @click="toDownload(scope.row)">下载</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -421,6 +422,32 @@ export default {
       this.viewState = 4
       this.$refs['divInfo'].showInfo(row)
     },
+    toDownload(row) {
+      req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((res) => {
+        if (res.success) {
+          var xhr = new XMLHttpRequest()
+          xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '交回车辆入库申请单', true)
+          xhr.setRequestHeader('token', getStorage())
+          xhr.responseType = 'blob'
+          xhr.onload = function(e) {
+            // 如果请求执行成功
+            var blob = this.response
+            var filename = '交回车辆入库申请单.pdf'
+            var a = document.createElement('a')
+            // blob.type="application/octet-stream";
+            // 创键临时url对象
+            var url = URL.createObjectURL(blob)
+            a.href = url
+            a.download = filename
+            a.click()
+            // 释放之前创建的URL对象
+            window.URL.revokeObjectURL(url)
+          }
+          // 发送请求
+          xhr.send()
+        }
+      }).catch(() => {})
+    },
     toSettle() {
       if (this.sids.length === 1) {
         if (this.multipleSelection[0].nodeState === '已办结') {

anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue

@@ -195,7 +195,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.companyCurrentNotPrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">资方未到期金额</div>
+              <div class="span-sty">公司未到期金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.bankNotPrice }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -231,7 +231,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <div class="span-sty">结清利润</div>
+              <div class="span-sty">预计结清利润</div>
               <el-form-item><span class="addinputInfo">{{ calculateProfit }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -247,15 +247,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="24">
-              <div class="span-sty">资方收款账户名称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankReceivingAccount" clearable placeholder=""/></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">资方收款账号</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAccountNo" clearable placeholder=""/></el-form-item>
-            </el-col>
-            <el-col :span="8">
               <div class="span-sty">付款时需备注内容</div>
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.payRemarks" clearable placeholder=""/></el-form-item>
             </el-col>
@@ -311,7 +303,7 @@ export default {
     },
     // 结清利润计算
     calculateProfit() {
-      return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable)) || 0
+      return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice))) || 0
     }
   },
   data() {
@@ -323,7 +315,6 @@ export default {
       formobj: {
         amount: '',
         applyDate: '',
-        bankAccountNo: '',
         bankContractNo: '',
         bankCostVo: {
           bankContractLiquidated: '',
@@ -343,7 +334,6 @@ export default {
         },
         bankName: '',
         bankSid: '',
-        bankReceivingAccount: '',
         busVinSid: '',
         buybacksReason: '',
         buyfiles: [],
@@ -540,7 +530,6 @@ export default {
       this.formobj = {
         amount: '',
         applyDate: '',
-        bankAccountNo: '',
         bankContractNo: '',
         bankCostVo: {
           bankContractLiquidated: '',
@@ -560,7 +549,6 @@ export default {
         },
         bankName: '',
         bankSid: '',
-        bankReceivingAccount: '',
         busVinSid: '',
         buybacksReason: '',
         buyfiles: [],

anrui-riskcenter-ui/src/views/buyback/buybackInfo.vue

@@ -182,7 +182,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.companyCurrentNotPrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">资方未到期金额</div>
+              <div class="span-sty">公司未到期金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.bankNotPrice }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -218,7 +218,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <div class="span-sty">结清利润</div>
+              <div class="span-sty">预计结清利润</div>
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.profit }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -234,15 +234,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8" class="tlineheightb">
+            <el-col :span="24" class="tlineheightb">
-              <div class="span-sty">资方收款账户名称</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.bankReceivingAccount }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">资方收款账号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.bankAccountNo }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">付款时需备注内容</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
             </el-col>
@@ -283,7 +275,6 @@ export default {
       formobj: {
         amount: '',
         applyDate: '',
-        bankAccountNo: '',
         bankContractNo: '',
         bankCostVo: {
           bankContractLiquidated: '',
@@ -303,7 +294,6 @@ export default {
         },
         bankName: '',
         bankSid: '',
-        bankReceivingAccount: '',
         busVinSid: '',
         buybacksReason: '',
         buyfiles: [],
@@ -404,7 +394,6 @@ export default {
       this.formobj = {
         amount: '',
         applyDate: '',
-        bankAccountNo: '',
         bankContractNo: '',
         bankCostVo: {
           bankContractLiquidated: '',
@@ -424,7 +413,6 @@ export default {
         },
         bankName: '',
         bankSid: '',
-        bankReceivingAccount: '',
         busVinSid: '',
         buybacksReason: '',
         buyfiles: [],

anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackDaiBan.vue

@@ -185,7 +185,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.companyCurrentNotPrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">资方未到期金额</div>
+              <div class="span-sty">公司未到期金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.bankNotPrice }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -221,7 +221,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <div class="span-sty">结清利润</div>
+              <div class="span-sty">预计结清利润</div>
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.profit }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -237,15 +237,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8" class="tlineheightb">
+            <el-col :span="24" class="tlineheightb">
-              <div class="span-sty">资方收款账户名称</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.bankReceivingAccount }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">资方收款账号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.bankAccountNo }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">付款时需备注内容</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
             </el-col>
@@ -325,7 +317,6 @@ export default {
       formobj: {
         amount: '',
         applyDate: '',
-        bankAccountNo: '',
         bankContractNo: '',
         bankCostVo: {
           bankContractLiquidated: '',
@@ -345,7 +336,6 @@ export default {
         },
         bankName: '',
         bankSid: '',
-        bankReceivingAccount: '',
         busVinSid: '',
         buybacksReason: '',
         buyfiles: [],

anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue

@@ -194,7 +194,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.companyCurrentNotPrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">资方未到期金额</div>
+              <div class="span-sty">公司未到期金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.bankNotPrice }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -230,7 +230,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <div class="span-sty">结清利润</div>
+              <div class="span-sty">预计结清利润</div>
               <el-form-item><span class="addinputInfo">{{ calculateProfit }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -246,15 +246,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="24">
-              <div class="span-sty">资方收款账户名称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankReceivingAccount" clearable placeholder=""/></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">资方收款账号</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAccountNo" clearable placeholder=""/></el-form-item>
-            </el-col>
-            <el-col :span="8">
               <div class="span-sty">付款时需备注内容</div>
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.payRemarks" clearable placeholder=""/></el-form-item>
             </el-col>
@@ -310,7 +302,7 @@ export default {
     },
     // 结清利润计算
     calculateProfit() {
-      return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable)) || 0
+      return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice))) || 0
     }
   },
   data() {
@@ -322,7 +314,6 @@ export default {
       formobj: {
         amount: '',
         applyDate: '',
-        bankAccountNo: '',
         bankContractNo: '',
         bankCostVo: {
           bankContractLiquidated: '',
@@ -342,7 +333,6 @@ export default {
         },
         bankName: '',
         bankSid: '',
-        bankReceivingAccount: '',
         busVinSid: '',
         buybacksReason: '',
         buyfiles: [],

anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackYiBan.vue

@@ -182,7 +182,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.companyCurrentNotPrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">资方未到期金额</div>
+              <div class="span-sty">公司未到期金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.bankNotPrice }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -218,7 +218,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <div class="span-sty">结清利润</div>
+              <div class="span-sty">预计结清利润</div>
               <el-form-item><span class="addinputInfo">{{ formobj.companyCostVo.profit }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -234,15 +234,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8" class="tlineheightb">
+            <el-col :span="24" class="tlineheightb">
-              <div class="span-sty">资方收款账户名称</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.bankReceivingAccount }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">资方收款账号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.bankAccountNo }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">付款时需备注内容</div>
               <el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
             </el-col>
@@ -283,7 +275,6 @@ export default {
       formobj: {
         amount: '',
         applyDate: '',
-        bankAccountNo: '',
         bankContractNo: '',
         bankCostVo: {
           bankContractLiquidated: '',
@@ -303,7 +294,6 @@ export default {
         },
         bankName: '',
         bankSid: '',
-        bankReceivingAccount: '',
         busVinSid: '',
         buybacksReason: '',
         buyfiles: [],

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyRest.java

@@ -203,12 +203,12 @@ public class LoanBePadsincereApplyRest implements LoanBePadsincereApplyFeign {
 
 	@Override
 	public ResultBean pushAdvancesVoucher(String sid, String paySid) {
-		return loanBePadsincereApplyService.pushAdvancesVoucher(sid,paySid);
+		return loanBePadsincereApplyService.pushAdvancesVoucherNew(sid,paySid);
 	}
 
 	@Override
 	public ResultBean<RskVoucher> pushAdvancesReturnVoucher(String sid, String paySid) {
-		return loanBePadsincereApplyService.pushAdvancesReturnVoucher(sid,paySid);
+		return loanBePadsincereApplyService.pushAdvancesReturnVoucherNew(sid,paySid);
 	}
 
 	@Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -1249,6 +1249,172 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         return rb.success();
     }
 
+    public ResultBean pushAdvancesVoucherNew(String sid, String paySid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<LoanBePadsincereVeh> records = loanBePadsincereVehService.selByMainSidAndPaySid(sid, paySid);
+        FinPaymentrecord paymentrecord = finPaymentrecordFeign.fetchBySid(paySid).getData();
+        if (!records.isEmpty()) {
+            PaymentVoucher paymentVoucher = new PaymentVoucher();
+            List<PaymentVoucher.PaymentVoucherDetail> voucherDetails = new ArrayList<>();
+            LoanBePadsincereVeh l = records.get(0);
+            if (null != l) {
+                String accountNumber = paymentrecord.getPayBankAccount();
+                paymentVoucher.setBankAccount(paymentrecord.getPayBankAccount());
+                String mainSid = l.getMainSid();
+                LoanBePadsincereApply loanBePadsincereApply = fetchBySid(mainSid);
+                FinManufacturerBank manufacturerBank = finManufacturerBankFeign.selOneByBankNo(accountNumber, loanBePadsincereApply.getUseOrgSid()).getData();
+                if (null != manufacturerBank) {
+                    paymentVoucher.setPayTypeCode(manufacturerBank.getDueBankKey());
+                }
+                String useOrgSid = loanBePadsincereApply.getUseOrgSid();
+                SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+                if (null != organizationVo) {
+                    paymentVoucher.setUseOrgCode(organizationVo.getOrgCode());
+                }
+            }
+            PaymentVoucher.PaymentVoucherDetail voucherDetail1 = new PaymentVoucher.PaymentVoucherDetail();
+            voucherDetail1.setType("贷方");
+            List<BigDecimal> result = new ArrayList<>();
+            records.stream().forEach(r -> {
+                result.add(new BigDecimal(r.getPadMoney()));
+            });
+            BigDecimal b = result.stream()
+                    // 使用reduce()聚合函数,实现累加器
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            voucherDetail1.setAmount(b);
+            voucherDetail1.setDataTime(new DateTime());
+            voucherDetails.add(voucherDetail1);
+
+            for (LoanBePadsincereVeh v : records) {
+                LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.selOneByBankNoAndBusVinSid(v.getBankContractNo(), v.getSaleVehSid());
+                if (null != planDetails) {
+                    String bankName = planDetails.getBankName();
+                    String orgCode = "";
+                    LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
+                    if (null != schedule) {
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
+                            orgCode = schedule.getCwDeptNo();
+                        }
+                    }
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
+                    BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
+                    String customerNumber = "";
+                    if (null != salesOrder) {
+                        if (null != busSalesOrderVehicle) {
+                            //判断财务系统是否有客户
+                            Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                            String linkNo = "";
+                            BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                            if (!aBoolean) {
+                                BdCustomer bdCustomer = new BdCustomer();
+                                bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+                                bdCustomer.setFShortName(salesOrder.getContractNo());
+                                BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+                                bdCustomer.setTOrgIds(data.getOrgCode());
+                                if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                                    String vinNo = busSalesOrderVehicle.getLinkNo();
+                                    if (vinNo.length() > 8) {
+                                        linkNo = vinNo.substring(vinNo.length() - 8);
+                                    } else {
+                                        linkNo = busSalesOrderVehicle.getLinkNo();
+                                    }
+                                    if (null != borrowerDetailsVo) {
+                                        bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+                                    }
+                                } else {
+                                    if (null != borrowerDetailsVo) {
+                                        bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+                                    }
+                                }
+                                ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+                                if (resultBean.getSuccess()) {
+                                    customerNumber = bdCustomer.getFNumber();
+                                }
+                            } else {
+                                customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                            }
+                        }
+                    }
+                    if("0".equals(busSalesOrderVehicle.getRiskState().toString())){
+                        if (StringUtils.isNotBlank(v.getBankBeMoney())) {
+                            BigDecimal beMoney = new BigDecimal(v.getBankBeMoney());
+                            if (beMoney.compareTo(BigDecimal.ZERO) > 0) {
+                                PaymentVoucher.PaymentVoucherDetail voucherDetail = new PaymentVoucher.PaymentVoucherDetail();
+                                voucherDetail.setSceneCode(SceneCodeEnum.PADSINCERE_VOUCHER1.getCode());
+                                voucherDetail.setType("借方");
+                                if (StringUtils.isNotBlank(bankName)) {
+                                    voucherDetail.setBankName(bankName);
+                                }
+                                voucherDetail.setDeptCode(orgCode);
+                                if (StringUtils.isNotBlank(customerNumber)) {
+                                    voucherDetail.setCustomerCode(customerNumber);
+                                }
+                                voucherDetail.setAmount(beMoney);
+                                voucherDetails.add(voucherDetail);
+                            }
+                        }
+                        if (StringUtils.isNotBlank(v.getBankBeInter())) {
+                            BigDecimal beInter = new BigDecimal(v.getBankBeInter());
+                            if (beInter.compareTo(BigDecimal.ZERO) > 0) {
+                                PaymentVoucher.PaymentVoucherDetail voucherDetail = new PaymentVoucher.PaymentVoucherDetail();
+                                voucherDetail.setSceneCode(SceneCodeEnum.PADSINCERE_VOUCHER2.getCode());
+                                voucherDetail.setType("借方");
+                                if (StringUtils.isNotBlank(bankName)) {
+                                    voucherDetail.setBankName(bankName);
+                                }
+                                voucherDetail.setDeptCode(orgCode);
+                                if (StringUtils.isNotBlank(customerNumber)) {
+                                    voucherDetail.setCustomerCode(customerNumber);
+                                }
+                                voucherDetail.setAmount(beInter);
+                                voucherDetails.add(voucherDetail);
+                            }
+                        }
+                    }else{
+                        if (StringUtils.isNotBlank(v.getBankBeMoney())) {
+                            BigDecimal beMoney = new BigDecimal(v.getBankBeMoney());
+                            if (beMoney.compareTo(BigDecimal.ZERO) > 0) {
+                                PaymentVoucher.PaymentVoucherDetail voucherDetail = new PaymentVoucher.PaymentVoucherDetail();
+                                voucherDetail.setSceneCode(SceneCodeEnum.PADSINCERE_VOUCHER3.getCode());
+                                voucherDetail.setType("借方");
+                                if (StringUtils.isNotBlank(bankName)) {
+                                    voucherDetail.setBankName(bankName);
+                                }
+                                voucherDetail.setDeptCode(orgCode);
+                                if (StringUtils.isNotBlank(customerNumber)) {
+                                    voucherDetail.setCustomerCode(customerNumber);
+                                }
+                                voucherDetail.setAmount(beMoney);
+                                voucherDetails.add(voucherDetail);
+                            }
+                        }
+                        if (StringUtils.isNotBlank(v.getBankBeInter())) {
+                            BigDecimal beInter = new BigDecimal(v.getBankBeInter());
+                            if (beInter.compareTo(BigDecimal.ZERO) > 0) {
+                                PaymentVoucher.PaymentVoucherDetail voucherDetail = new PaymentVoucher.PaymentVoucherDetail();
+                                voucherDetail.setSceneCode(SceneCodeEnum.PADSINCERE_VOUCHER4.getCode());
+                                voucherDetail.setType("借方");
+                                if (StringUtils.isNotBlank(bankName)) {
+                                    voucherDetail.setBankName(bankName);
+                                }
+                                voucherDetail.setDeptCode(orgCode);
+                                if (StringUtils.isNotBlank(customerNumber)) {
+                                    voucherDetail.setCustomerCode(customerNumber);
+                                }
+                                voucherDetail.setAmount(beInter);
+                                voucherDetails.add(voucherDetail);
+                            }
+                        }
+                    }
+
+                }
+            }
+            paymentVoucher.setVoucherDetails(voucherDetails);
+            finKingDeeFeign.saveAdvancesVoucher(paymentVoucher);
+        }
+        return rb.success();
+    }
+
     public ResultBean<String> bepadsincereCreatePdf(String sid) {
         ResultBean rb = ResultBean.fireFail();
         String finalPath = "";
@@ -1634,6 +1800,174 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         return rb.success();
     }
 
+    public ResultBean<RskVoucher> pushAdvancesReturnVoucherNew(String sid, String paySid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<LoanBePadsincereVeh> records = loanBePadsincereVehService.selByMainSidAndPaySid(sid, paySid);
+        FinPaymentrecord paymentrecord = finPaymentrecordFeign.fetchBySid(paySid).getData();
+        if (!records.isEmpty()) {
+            RskPaymentVoucher paymentVoucher = new RskPaymentVoucher();
+            List<RskPaymentVoucher.PaymentVoucherDetail> voucherDetails = new ArrayList<>();
+            LoanBePadsincereVeh l = records.get(0);
+            if (null != l) {
+                String accountNumber = paymentrecord.getPayBankAccount();
+                paymentVoucher.setBankAccount(paymentrecord.getPayBankAccount());
+                String mainSid = l.getMainSid();
+                LoanBePadsincereApply loanBePadsincereApply = fetchBySid(mainSid);
+                FinManufacturerBank manufacturerBank = finManufacturerBankFeign.selOneByBankNo(accountNumber, loanBePadsincereApply.getUseOrgSid()).getData();
+                if (null != manufacturerBank) {
+                    paymentVoucher.setPayTypeCode(manufacturerBank.getDueBankKey());
+                }
+                String useOrgSid = loanBePadsincereApply.getUseOrgSid();
+                SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+                if (null != organizationVo) {
+                    paymentVoucher.setUseOrgCode(organizationVo.getOrgCode());
+                }
+            }
+            RskPaymentVoucher.PaymentVoucherDetail voucherDetail1 = new RskPaymentVoucher.PaymentVoucherDetail();
+            voucherDetail1.setType("贷方");
+            List<BigDecimal> result = new ArrayList<>();
+            records.stream().forEach(r -> {
+                result.add(new BigDecimal(r.getPadMoney()));
+            });
+            BigDecimal b = result.stream()
+                    // 使用reduce()聚合函数,实现累加器
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            voucherDetail1.setAmount(b);
+            voucherDetail1.setDataTime(new DateTime());
+            voucherDetails.add(voucherDetail1);
+            for (LoanBePadsincereVeh v : records) {
+                LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.selOneByBankNoAndBusVinSid(v.getBankContractNo(), v.getSaleVehSid());
+                if (null != planDetails) {
+                    String bankName = planDetails.getBankName();
+                    String orgCode = "";
+                    LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
+                    if (null != schedule) {
+                        if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
+                            orgCode = schedule.getCwDeptNo();
+                        }
+                    }
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
+                    BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
+                    String customerNumber = "";
+                    if (null != salesOrder) {
+                        if (null != busSalesOrderVehicle) {
+                            //判断财务系统是否有客户
+                            Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                            String linkNo = "";
+                            BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                            if (!aBoolean) {
+                                //  List<BdCustomer> bdCustomers = new ArrayList<>();
+                                BdCustomer bdCustomer = new BdCustomer();
+                                bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+                                bdCustomer.setFShortName(salesOrder.getContractNo());
+                                BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+                                bdCustomer.setTOrgIds(data.getOrgCode());
+                                if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                                    String vinNo = busSalesOrderVehicle.getLinkNo();
+                                    if (vinNo.length() > 8) {
+                                        linkNo = vinNo.substring(vinNo.length() - 8);
+                                    } else {
+                                        linkNo = busSalesOrderVehicle.getLinkNo();
+                                    }
+                                    if (null != borrowerDetailsVo) {
+                                        bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+                                    }
+                                } else {
+                                    if (null != borrowerDetailsVo) {
+                                        bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+                                    }
+                                }
+                                //  bdCustomers.add(bdCustomer);
+                                ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+                                if (resultBean.getSuccess()) {
+                                    customerNumber = bdCustomer.getFNumber();
+                                }
+                            } else {
+                                customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                            }
+                        }
+                    }
+                    if("0".equals(busSalesOrderVehicle.getRiskState().toString())){
+                        if (StringUtils.isNotBlank(v.getBankBeMoney())) {
+                            BigDecimal beMoney = new BigDecimal(v.getBankBeMoney());
+                            if (beMoney.compareTo(BigDecimal.ZERO) > 0) {
+                                RskPaymentVoucher.PaymentVoucherDetail voucherDetail = new RskPaymentVoucher.PaymentVoucherDetail();
+                                voucherDetail.setSceneCode(SceneCodeEnum.PADSINCERE_VOUCHER1.getCode());
+                                voucherDetail.setType("借方");
+                                if (StringUtils.isNotBlank(bankName)) {
+                                    voucherDetail.setBankName(bankName);
+                                }
+                                voucherDetail.setDeptCode(orgCode);
+                                if (StringUtils.isNotBlank(customerNumber)) {
+                                    voucherDetail.setCustomerCode(customerNumber);
+                                }
+                                voucherDetail.setAmount(beMoney);
+                                voucherDetails.add(voucherDetail);
+                            }
+                        }
+                        if (StringUtils.isNotBlank(v.getBankBeInter())) {
+                            BigDecimal beInter = new BigDecimal(v.getBankBeInter());
+                            if (beInter.compareTo(BigDecimal.ZERO) > 0) {
+                                RskPaymentVoucher.PaymentVoucherDetail voucherDetail = new RskPaymentVoucher.PaymentVoucherDetail();
+                                voucherDetail.setSceneCode(SceneCodeEnum.PADSINCERE_VOUCHER2.getCode());
+                                voucherDetail.setType("借方");
+                                if (StringUtils.isNotBlank(bankName)) {
+                                    voucherDetail.setBankName(bankName);
+                                }
+                                voucherDetail.setDeptCode(orgCode);
+                                if (StringUtils.isNotBlank(customerNumber)) {
+                                    voucherDetail.setCustomerCode(customerNumber);
+                                }
+                                voucherDetail.setAmount(beInter);
+                                voucherDetails.add(voucherDetail);
+                            }
+                        }
+                    }else{
+                        if (StringUtils.isNotBlank(v.getBankBeMoney())) {
+                            BigDecimal beMoney = new BigDecimal(v.getBankBeMoney());
+                            if (beMoney.compareTo(BigDecimal.ZERO) > 0) {
+                                RskPaymentVoucher.PaymentVoucherDetail voucherDetail = new RskPaymentVoucher.PaymentVoucherDetail();
+                                voucherDetail.setSceneCode(SceneCodeEnum.PADSINCERE_VOUCHER3.getCode());
+                                voucherDetail.setType("借方");
+                                if (StringUtils.isNotBlank(bankName)) {
+                                    voucherDetail.setBankName(bankName);
+                                }
+                                voucherDetail.setDeptCode(orgCode);
+                                if (StringUtils.isNotBlank(customerNumber)) {
+                                    voucherDetail.setCustomerCode(customerNumber);
+                                }
+                                voucherDetail.setAmount(beMoney);
+                                voucherDetails.add(voucherDetail);
+                            }
+                        }
+                        if (StringUtils.isNotBlank(v.getBankBeInter())) {
+                            BigDecimal beInter = new BigDecimal(v.getBankBeInter());
+                            if (beInter.compareTo(BigDecimal.ZERO) > 0) {
+                                RskPaymentVoucher.PaymentVoucherDetail voucherDetail = new RskPaymentVoucher.PaymentVoucherDetail();
+                                voucherDetail.setSceneCode(SceneCodeEnum.PADSINCERE_VOUCHER4.getCode());
+                                voucherDetail.setType("借方");
+                                if (StringUtils.isNotBlank(bankName)) {
+                                    voucherDetail.setBankName(bankName);
+                                }
+                                voucherDetail.setDeptCode(orgCode);
+                                if (StringUtils.isNotBlank(customerNumber)) {
+                                    voucherDetail.setCustomerCode(customerNumber);
+                                }
+                                voucherDetail.setAmount(beInter);
+                                voucherDetails.add(voucherDetail);
+                            }
+                        }
+                    }
+
+                }
+            }
+            paymentVoucher.setVoucherDetails(voucherDetails);
+            RskVoucher rskVoucher = returnAdvancesVoucher(paymentVoucher);
+            return rb.success().setData(rskVoucher);
+        }
+        return rb.success();
+    }
+
     public RskVoucher returnAdvancesVoucher(RskPaymentVoucher voucher) {
         ResultBean rb = ResultBean.fireFail();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1657,6 +1991,17 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     } else if (voucherDetail.getSceneCode().equals(SceneCodeEnum.PADSINCERE_VOUCHER2.getCode())) {
                         dto1.setSummary(voucherDetail.getBankName() + "垫款资方违约金");
                         dto1.setSubjectNo("1201.02.03");
+                    }else {
+                        if(voucherDetail.getSceneCode().equals(SceneCodeEnum.PADSINCERE_VOUCHER3.getCode())){
+                            dto1.setSummary(voucherDetail.getBankName() + "垫付" + voucherDetail.getCustomerName() + "月还款");
+                            DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(voucherDetail.getBankName(), "investorsCode").getData();
+                            if (null != dictCommonVo) {
+                                dto1.setSubjectNo(dictCommonVo.getDictValue());
+                            }
+                        }else if(voucherDetail.getSceneCode().equals(SceneCodeEnum.PADSINCERE_VOUCHER4.getCode())){
+                            dto1.setSummary(voucherDetail.getBankName() + "垫款资方违约金");
+                            dto1.setSubjectNo("1201.03.01");
+                        }
                     }
                     dto1.setDimensionDept(voucherDetail.getDeptCode());
                     dto1.setDimensionCustom(voucherDetail.getCustomerCode());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@@ -680,7 +680,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                             new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
                     Future future1 = pool.submit(() -> {
                         //推送划扣凭证
-                        pushBuckleVoucher(businessSid);
+                        pushBuckleVoucherNew(businessSid);
                     });
                 } catch (Exception e) {
                     e.printStackTrace();