yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 days ago
parent
c707e933b7 c40b6fc331
commit
9a3e9d220d
30 changed files with 547 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java
  2. 22
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  3. 4
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java
  4. 30
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java
  5. 18
      anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java
  6. 7
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.java
  7. 181
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportMapper.xml
  8. 10
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java
  9. 55
      anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java
  10. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesCostAppVo.java
  11. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/SecondarySalesAppVo.java
  12. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java
  13. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCostVo.java
  14. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java
  15. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml
  16. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java
  17. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
  18. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
  19. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java
  20. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java
  21. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java
  22. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
  23. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
  24. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml
  25. 15
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
  26. 18
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
  27. 156
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
  28. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java
  29. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesCostAppVo.java
  30. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeignFallback.java
View File

@ -34,19 +34,6 @@ import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.List;
/**
* Project: anrui-fin(销售相关) <br/>
* File: FinUncollectedReceivablesDetailedFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeignFallback <br/>
* Description: 应收未收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class FinUncollectedReceivablesDetailedJRFeignFallback implements FinUncollectedReceivablesDetailedJRFeign {
@ -85,4 +72,9 @@ public class FinUncollectedReceivablesDetailedJRFeignFallback implements FinUnco
public ResultBean<FinUncollectedReceivablesDetailedJR> getUnJrByPayCostTitleKeyAndBusSid(String key, String busSid) {
return null;
}
@Override
public ResultBean<List<FinUncollectedReceivablesDetailedJR>> selByBusSid(List<String> busSids) {
return null;
}
}

22
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -2130,7 +2130,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//判断财务系统是否有客户
Boolean aBoolean = bdCustomerService.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(busSalesOrder.getContractNo());
@ -2307,7 +2307,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//判断财务系统是否有客户
Boolean aBoolean = bdCustomerService.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(busSalesOrder.getContractNo());
@ -4910,7 +4910,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
Boolean aBoolean = finKingDeeService.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
@ -7385,7 +7385,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String linkNo = "";
String customerName = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
@ -7477,7 +7477,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String linkNo = "";
String customerName = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
@ -7559,7 +7559,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String linkNo = "";
String customerName = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
@ -7659,7 +7659,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
Boolean aBoolean = finKingDeeFeignRest.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>()666;
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
@ -7731,7 +7731,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String linkNo = "";
String customerName = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
@ -7871,7 +7871,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String linkNo = "";
String customerName = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
@ -7977,7 +7977,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String linkNo = "";
String customerName = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
@ -8086,7 +8086,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String linkNo = "";
String customerName = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());

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

@ -34,6 +34,10 @@ public interface FactoryDaliyReportFeign {
@ResponseBody
ResultBean<SybVo> sybBrands(@RequestParam("divisionSid") String divisionSid);
@GetMapping("/list3")
@ResponseBody
ResultBean<FgsVo> list3(@RequestParam("divisionSid") String divisionSid);
}

30
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsVo.java
View File

@ -0,0 +1,30 @@
package com.yxt.anrui.reportcenter.api.factoryDailyReport;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2025/5/29
**/
@Data
public class FgsVo {
private String title;
private List<YearAllVo> row1;
private List<FgsYearVo> 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;
}

18
anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FgsYearVo.java
View File

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

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

@ -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.FgsYearVo;
import com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -28,4 +29,10 @@ public interface FactoryDaliyReportMapper {
List<YearAllVo> getBrandsNameList(String divisionSid);
List<FactoryDaliyReportVo> getSybList2(String divisionSid);
List<YearAllVo> getUseOrgNameList(String divisionSid);
List<FgsYearVo> getRow2(String divisionSid);
List<FactoryDaliyReportVo> getFgsList(String divisionSid);
}

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

@ -430,4 +430,185 @@
ORDER BY a.brandSid desc, a.year DESC;
</select>
<select id="getUseOrgNameList" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.YearAllVo">
SELECT
so.name as name,
so.sid AS linkSid,
COUNT(DISTINCT LEFT(date_info.date_str, 4)) AS colspan
FROM (
-- 单车返利表
SELECT
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS second_level_org,
palceGenDate AS date_str
FROM anrui_scm.scm_veh_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
AND palceGenDate IS NOT NULL
AND LEFT(palceGenDate, 4) != '' and LEFT(palceGenDate, 4) is not null
UNION ALL
-- 专项返利表
SELECT
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS second_level_org,
palceGenDate AS date_str
FROM anrui_scm.scm_special_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
AND palceGenDate IS NOT NULL
AND LEFT(palceGenDate, 4) != '' and LEFT(palceGenDate, 4) is not null
UNION ALL
-- 回款返利表
SELECT
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS second_level_org,
collectionDate AS date_str
FROM anrui_scm.scm_collection_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
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="getRow2" resultType="com.yxt.anrui.reportcenter.api.factoryDailyReport.FgsYearVo">
SELECT
a.year name,
concat(so.name,'(',a.year,')') as title,
so.sid as linkSid
FROM (
SELECT
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name
FROM anrui_scm.scm_veh_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
UNION ALL
SELECT
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name
FROM anrui_scm.scm_special_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
UNION ALL
SELECT
LEFT(collectionDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1) AS division_name
FROM anrui_scm.scm_collection_rebate
WHERE orgPath LIKE concat('%/',#{divisionSid},'/%')
GROUP BY LEFT(collectionDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
) a
LEFT JOIN anrui_portal.sys_organization so
ON so.sid = a.division_name
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>
<select id="getFgsList" 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, '/', 3), '/', -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
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(palceGenDate, 4),SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
UNION ALL
SELECT
LEFT(palceGenDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -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
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(palceGenDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -1)
UNION ALL
SELECT
LEFT(collectionDate, 4) AS year,
SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -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
where SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 2), '/', -1) = #{divisionSid}
GROUP BY LEFT(collectionDate, 4), SUBSTRING_INDEX(SUBSTRING_INDEX(orgPath, '/', 3), '/', -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>

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

@ -1,9 +1,6 @@
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.anrui.reportcenter.api.factoryDailyReport.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -50,5 +47,10 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign {
return factoryDaliyReportService.getSybBrands(divisionSid);
}
@Override
public ResultBean<FgsVo> list3(String divisionSid) {
return factoryDaliyReportService.list3(divisionSid);
}
}

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

@ -273,4 +273,59 @@ public class FactoryDaliyReportService {
}
return rb.success().setData(sysVo);
}
public ResultBean<FgsVo> list3(String divisionSid) {
ResultBean<FgsVo> rb = ResultBean.fireFail();
FgsVo fgsVo = new FgsVo();
fgsVo.setTitle("分公司报表");
//先查询有哪些分公司以及分公司下的年份
List<YearAllVo> useOrgNameList = factoryDaliyReportMapper.getUseOrgNameList(divisionSid);
List<FgsYearVo> row2 = factoryDaliyReportMapper.getRow2(divisionSid);
List<FactoryDaliyReportVo> factoryDaliyReportVoList = factoryDaliyReportMapper.getFgsList(divisionSid);
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> 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());
fgsVo.setRow1(useOrgNameList);
fgsVo.setRow2(row2);
fgsVo.setRow3(row3);
fgsVo.setRow4(row4);
fgsVo.setRow5(row5);
fgsVo.setRow6(row6);
fgsVo.setRow7(row7);
fgsVo.setRow8(row8);
fgsVo.setRow9(row9);
fgsVo.setRow10(row10);
fgsVo.setRow11(row11);
}
return rb.success().setData(fgsVo);
}
}

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesCostAppVo.java
View File

@ -4,6 +4,7 @@ import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@ -71,4 +72,9 @@ public class LoanSecondarySalesCostAppVo {
private String vehicleEvaluation;
private String filesss;
@ApiModelProperty("是否追偿1是0否")
private String isRecovery;
@ApiModelProperty("购方应交总金额")
private String purMeetCost;
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/SecondarySalesAppVo.java
View File

@ -85,4 +85,6 @@ public class SecondarySalesAppVo {
@ApiModelProperty("销售订单sid")
private String salesOrderSid;
@ApiModelProperty("竞价结果")
private String result;
}

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCost.java
View File

@ -72,5 +72,6 @@ public class LoanSecondarySalesCost extends BaseEntity {
private BigDecimal vehicleEvaluation;
@ApiModelProperty("是否追偿1是0否")
private Integer isRecovery;
@ApiModelProperty("购方应交总金额")
private BigDecimal purMeetCost;
}

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalescost/LoanSecondarySalesCostVo.java
View File

@ -72,7 +72,7 @@ public class LoanSecondarySalesCostVo {
private String vehicleEvaluation;
@ApiModelProperty("是否追偿1是0否")
private Integer isRecovery;
@ApiModelProperty("购方应交总金额")
private BigDecimal purMeetCost;
private String filesss;
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java
View File

@ -77,5 +77,5 @@ public interface LoanBePadsincereVehMapper extends BaseMapper<LoanBePadsincereVe
@Select("select *,saleVehSid AS busVinSid from loan_be_padsincere_veh where mainSid = #{applySid} and bankContractNo = #{busSid}")
List<LoanBePadsincereVehDetailsVo> selByBankCont(@Param("applySid") String applySid, @Param("busSid") String busSid);
BigDecimal selByBusVinSid(String busVinSid);
List<LoanBePadsincereVehDetailsVo> selByBusVinSid(String busVinSid);
}

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.xml
View File

@ -20,11 +20,14 @@
and paySid = #{paySid}
</select>
<select id="selByBusVinSid" resultType="java.math.BigDecimal">
<select id="selByBusVinSid"
resultType="com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo">
SELECT
IF(SUM(padMoney), SUM(padMoney), 0)
IF(SUM(padMoney), SUM(padMoney), 0) AS padMoney,
period
FROM
loan_be_padsincere_veh
WHERE saleVehSid = #{busVinSid}
GROUP BY period
</select>
</mapper>

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java
View File

@ -116,7 +116,7 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
return baseMapper.selByBankCont(applySid, busSid);
}
public BigDecimal selByBusVinSid(String busVinSid) {
public List<LoanBePadsincereVehDetailsVo> selByBusVinSid(String busVinSid) {
return baseMapper.selByBusVinSid(busVinSid);
}
}

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

@ -747,8 +747,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
if (aBoolean != null && !aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
@ -878,7 +877,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
@ -985,8 +984,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
if (aBoolean != null && !aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
@ -1034,7 +1032,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancasecloseapply/LoanCaseCloseApplyService.java
View File

@ -634,7 +634,7 @@ public class LoanCaseCloseApplyService extends MybatisBaseService<LoanCaseCloseA
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyService.java
View File

@ -644,7 +644,7 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
if (aBoolean != null && !aBoolean) {
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
@ -668,7 +668,6 @@ public class LoanCaseExecuteApplyService extends MybatisBaseService<LoanCaseExec
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
}
// bdCustomers.add(bdCustomer);
ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitsubapply/LoanLawsuitSubApplyService.java
View File

@ -315,7 +315,20 @@ public class LoanLawsuitSubApplyService extends MybatisBaseService<LoanLawsuitSu
BigDecimal bankAmount = loanRepurchaseApplyService.selByBusVinSid(loanLawsuitVehVo.getBusVinSid());
loanLawsuitSubVehDetailsVo.setBankAmount(bankAmount);
}
loanLawsuitSubVehDetailsVo.setLawAomount(loanLawsuitSubVehDetailsVo.getCurrentBeMoney().add(loanLawsuitSubVehDetailsVo.getCurrentNotDuePrice()).add(loanLawsuitSubVehDetailsVo.getNotDuePrice()).add(loanLawsuitSubVehDetailsVo.getBankAmount()));
BigDecimal lawAomount = new BigDecimal("0");
if (loanLawsuitSubVehDetailsVo.getCurrentBeMoney() != null){
lawAomount = lawAomount.add(loanLawsuitSubVehDetailsVo.getCurrentBeMoney());
}
if (loanLawsuitSubVehDetailsVo.getCurrentNotDuePrice() != null){
lawAomount = lawAomount.add(loanLawsuitSubVehDetailsVo.getCurrentNotDuePrice());
}
if (loanLawsuitSubVehDetailsVo.getNotDuePrice() != null){
lawAomount = lawAomount.add(loanLawsuitSubVehDetailsVo.getNotDuePrice());
}
if (loanLawsuitSubVehDetailsVo.getBankAmount() != null){
lawAomount = lawAomount.add(loanLawsuitSubVehDetailsVo.getBankAmount());
}
loanLawsuitSubVehDetailsVo.setLawAomount(lawAomount);
loanLawsuitSubVehDetailsVos.add(loanLawsuitSubVehDetailsVo);
}
loanLawsuitSubApplyDetailsVo.setLoanLawsuitSubVehList(loanLawsuitSubVehDetailsVos);

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

@ -89,4 +89,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper<LoanRepaymentHist
IPage<RepaymentStatisticsVo> repaymentStatistics2(IPage<LoanRepaymentHistory> page, @Param(Constants.WRAPPER)QueryWrapper<LoanRepaymentHistory> qw);
List<RepaymentStatisticsVo> repaymentStatisticsList(@Param(Constants.WRAPPER)QueryWrapper<LoanRepaymentHistory> qw);
List<LoanRepaymentHistory> selHistoryByPlanSids(@Param("jhmxSids") List<String> jhmxSids);
}

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

@ -1121,4 +1121,18 @@
${ew.sqlSegment}
</where>
</select>
<select id="selHistoryByPlanSids"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory">
SELECT
*
FROM
loan_repayment_history
<if test="jhmxSids != null and jhmxSids.size() != 0">
WHERE planDetailSid IN
<foreach collection="jhmxSids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>

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

@ -2422,4 +2422,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
}
public List<LoanRepaymentHistory> selHistoryByPlanSids(List<String> jhmxSids) {
return baseMapper.selHistoryByPlanSids(jhmxSids);
}
}

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyMapper.xml
View File

@ -79,6 +79,7 @@
from loan_return_veh_ledger
where useOrgSid = #{useOrgSid}
and vehType = '主车'
and stockStateKey = '0001'
</select>
<select id="selectSidOne"

15
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
View File

@ -720,7 +720,7 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
//2、未到期欠款 = 该车的还款明细中应还日期在当月之后的未还金额之和
//3、本金 = 该车的还款明细中是否转累欠状态为否1的且应还日期是本月的未还金额
//4、扣回车辆 = 累欠+未到期欠款+本金
//应收贷款车欠款_待处理欠款_扣回车辆
BigDecimal all = BigDecimal.ZERO;
//应收贷款车欠款_到期欠款_累欠
@ -731,25 +731,25 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
BigDecimal bjMoney = BigDecimal.ZERO;
String lq = loanRepaymentPlanDetailsService.getYqLq(loanReturnInboundApply.getBusVinSid());
lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
if ("1".equals(busSalesOrderVehicle.getRepoState().toString())) {//已回购
//查询回购的资方费用
LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
if(loanRepurchaseApply != null){
if (loanRepurchaseApply != null) {
LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
if(loanRepurchaseCost != null){
if (loanRepurchaseCost != null) {
//合同违约金
BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
if(bankContractLiquidated != null){
if (bankContractLiquidated != null) {
lqMoney = lqMoney.add(bankContractLiquidated);
}
//资方名义价
BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
if(bankNominalPrice != null){
if (bankNominalPrice != null) {
lqMoney = lqMoney.add(bankNominalPrice);
}
//资方其他费用
BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
if(bankOtherReceivable != null){
if (bankOtherReceivable != null) {
lqMoney = lqMoney.add(bankOtherReceivable);
}
}
@ -992,7 +992,6 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
busVinSid.removeAll(Collections.singleton(null));
}
qw.eq("la.nodeState", "已办结");
}
IPage<LoanReturnInboundApply> page = PagerUtil.queryToPage(pq);
IPage<ReturnInboundVo> pagging = baseMapper.getInboundList(page, qw, busVinSid);

18
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java
View File

@ -1286,6 +1286,24 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
}
}
secondarySalesAppVo.setLoanSecondarySalesCost(loanSecondarySalesCost);
//查询竞价结果
SysNoticeDetailsVo sysNotice = sysNoticeFeign.getDetails(sid).getData();
if(sysNotice != null){
//查询截止日期，是否小于或等于当前日期
String validityDate = sysNotice.getValidityDate();
// 解析截止日期（假设格式为 yyyy-MM-dd）
LocalDate noticeExpiryDate = LocalDate.parse(validityDate);
LocalDate currentDate = LocalDate.now();
// 判断是否已过期（截止日期 <= 当前日期）
if (noticeExpiryDate.isBefore(currentDate) || noticeExpiryDate.isEqual(currentDate)) {
LoanSecondarySalesBidding loanSecondarySalesBidding = loanSecondarySalesBiddingService.selectByMainSid(sid);
Date createTime = loanSecondarySalesBidding.getCreateTime();
LocalDate localDate = createTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
String formattedDate = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String result = loanSecondarySalesBidding.getCreateByName()+"在"+formattedDate+"竞价"+loanSecondarySalesBidding.getPrice()+"元";
secondarySalesAppVo.setResult(result);
}
}
return rb.success().setData(secondarySalesAppVo);
}
}

156
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
View File

@ -65,8 +65,10 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
@ -81,6 +83,7 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesN
import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
import com.yxt.anrui.riskcenter.biz.loanbepadsincereveh.LoanBePadsincereVehService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
@ -173,6 +176,8 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
@Autowired
private LoanBePadsincereVehService loanBePadsincereVehService;
@Autowired
private LoanRepaymentHistoryService loanRepaymentHistoryService;
public PagerVo<LoanSecondarySalesNotApplyVo> listPageVo(PagerQuery<LoanSecondarySalesNotApplyQuery> pq) {
LoanSecondarySalesNotApplyQuery query = pq.getParams();
@ -600,8 +605,8 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
//TOdO:
List<String> busVinSidList = loanSecondarySalesNotVehService.selectByMainSid(businessSid);
busVinSidList.removeAll(Collections.singleton(null));
if(!busVinSidList.isEmpty()){
pushRiskToFin2(finalLoanSecondarySalesNotApply,busVinSidList);
if (!busVinSidList.isEmpty()) {
pushRiskToFin2(finalLoanSecondarySalesNotApply, busVinSidList);
}
});
} catch (Exception e) {
@ -638,16 +643,16 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
//查询车辆还款计划明细
List<LoanRepaymentPlanDetails> loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selectByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid());
//查询车辆是否有垫款金额
BigDecimal dkje = loanBePadsincereVehService.selByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid());
List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByBusVinSid(loanSecondarySalesNotVehDetailsVo.getBusVinSid());
//获取明细sid集合
List<String> jhmxSids = loanRepaymentPlanDetails.stream().map(c -> c.getSid()).
collect(Collectors.toList());
//查询金融应收所有应收款
List<FinUncollectedReceivablesDetailedJR> data = finUncollectedReceivablesDetailedJRFeign.selByBusSid(jhmxSids).getData();
if (!data.isEmpty()){
if (!data.isEmpty()) {
for (FinUncollectedReceivablesDetailedJR datum : data) {
List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedFeign.fetchByReceivablesSid(datum.getSid()).getData();
if (finSelectedReceivablesDetaileds.isEmpty()){
if (finSelectedReceivablesDetaileds.isEmpty()) {
List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
fin.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
@ -668,9 +673,9 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
fin.setOrgSidPath(loanSecondarySalesNotApply.getOrgSidPath());
selectList.add(fin);
finSelectedReceivablesDetailedFeign.saveAll(selectList);
}else {
} else {
BigDecimal ys = finSelectedReceivablesDetaileds.stream().map(FinSelectedReceivablesDetailed::getSubscriptionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
if (ys.compareTo(datum.getReveivableMoney()) == -1){
if (ys.compareTo(datum.getReveivableMoney()) == -1) {
List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
fin.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
@ -695,6 +700,111 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
}
}
}
//月还
List<LoanRepaymentHistory> loanRepaymentHistories = loanRepaymentHistoryService.selHistoryByPlanSids(jhmxSids);
if (loanRepaymentHistories.isEmpty()) {
for (LoanRepaymentPlanDetails plan : loanRepaymentPlanDetails) {
List<LoanRepaymentHistory> histories = new ArrayList<>();
LoanRepaymentHistory history = new LoanRepaymentHistory();
history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
history.setDataTime(new Date());
history.setUpdateState("1");
history.setUpdateTime(new Date());
history.setActualDate(plan.getDueDate());
history.setActualMoney(plan.getDueMoney());
history.setBuckleKey("003");
history.setBuckle("审核通过");
history.setReturnWayKey("");
history.setReturnWay("");
history.setPayState(0);
history.setIsEnable(3);
history.setPlanDetailSid(plan.getSid());
history.setScheduleSid("");
history.setRemarks("认损");
histories.add(history);
loanRepaymentHistoryService.saveList(histories);
}
} else {
for (LoanRepaymentPlanDetails plan : loanRepaymentPlanDetails) {
List<LoanRepaymentHistory> loanRepaymentHistories1 = loanRepaymentHistoryService.selHistoryByPlanSid(plan.getSid());
BigDecimal sh = loanRepaymentHistories1.stream().map(LoanRepaymentHistory::getActualMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
if (!loanBePadsincereVehDetailsVos.isEmpty()) {
List<String> periods = loanBePadsincereVehDetailsVos.stream().map(v -> v.getPeriod()).collect(Collectors.toList());
if (periods.contains(plan.getPeriod())) {
for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
if (plan.getPeriod().equals(loanBePadsincereVehDetailsVo.getPeriod())) {
sh = sh.subtract(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney()));
if (sh.compareTo(plan.getDueMoney()) == -1) {
List<LoanRepaymentHistory> histories = new ArrayList<>();
LoanRepaymentHistory history = new LoanRepaymentHistory();
history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
history.setDataTime(new Date());
history.setUpdateState("1");
history.setUpdateTime(new Date());
history.setActualDate(plan.getDueDate());
history.setActualMoney(plan.getDueMoney().subtract(sh));
history.setBuckleKey("003");
history.setBuckle("审核通过");
history.setReturnWayKey("");
history.setReturnWay("");
history.setPayState(0);
history.setIsEnable(3);
history.setPlanDetailSid(plan.getSid());
history.setScheduleSid("");
history.setRemarks("认损");
histories.add(history);
loanRepaymentHistoryService.saveList(histories);
}
}
}
} else {
if (sh.compareTo(plan.getDueMoney()) == -1) {
List<LoanRepaymentHistory> histories = new ArrayList<>();
LoanRepaymentHistory history = new LoanRepaymentHistory();
history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
history.setDataTime(new Date());
history.setUpdateState("1");
history.setUpdateTime(new Date());
history.setActualDate(plan.getDueDate());
history.setActualMoney(plan.getDueMoney().subtract(sh));
history.setBuckleKey("003");
history.setBuckle("审核通过");
history.setReturnWayKey("");
history.setReturnWay("");
history.setPayState(0);
history.setIsEnable(3);
history.setPlanDetailSid(plan.getSid());
history.setScheduleSid("");
history.setRemarks("认损");
histories.add(history);
loanRepaymentHistoryService.saveList(histories);
}
}
}else {
if (sh.compareTo(plan.getDueMoney()) == -1) {
List<LoanRepaymentHistory> histories = new ArrayList<>();
LoanRepaymentHistory history = new LoanRepaymentHistory();
history.setCreateBySid(loanSecondarySalesNotApply.getCreateBySid());
history.setDataTime(new Date());
history.setUpdateState("1");
history.setUpdateTime(new Date());
history.setActualDate(plan.getDueDate());
history.setActualMoney(plan.getDueMoney().subtract(sh));
history.setBuckleKey("003");
history.setBuckle("审核通过");
history.setReturnWayKey("");
history.setReturnWay("");
history.setPayState(0);
history.setIsEnable(3);
history.setPlanDetailSid(plan.getSid());
history.setScheduleSid("");
history.setRemarks("认损");
histories.add(history);
loanRepaymentHistoryService.saveList(histories);
}
}
}
}
}
}
@ -708,7 +818,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
}
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanSecondarySalesNotApply.getCreateDeptSid()).getData();
for (int i = 0; i < busVinSidList.size(); i++){
for (int i = 0; i < busVinSidList.size(); i++) {
String busVinSid = busVinSidList.get(i);
//ToDo:
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData();
@ -766,25 +876,25 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
BigDecimal zjzyfMoney = BigDecimal.ZERO;
String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
if ("1".equals(busSalesOrderVehicle.getRepoState().toString())) {//已回购
//查询回购的资方费用
LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
if(loanRepurchaseApply != null){
if (loanRepurchaseApply != null) {
LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
if(loanRepurchaseCost != null){
if (loanRepurchaseCost != null) {
//合同违约金
BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
if(bankContractLiquidated != null){
if (bankContractLiquidated != null) {
lqMoney = lqMoney.add(bankContractLiquidated);
}
//资方名义价
BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
if(bankNominalPrice != null){
if (bankNominalPrice != null) {
lqMoney = lqMoney.add(bankNominalPrice);
}
//资方其他费用
BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
if(bankOtherReceivable != null){
if (bankOtherReceivable != null) {
lqMoney = lqMoney.add(bankOtherReceivable);
}
}
@ -798,7 +908,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
all = lqMoney.add(wdqMoney).add(bjMoney);
//已认款
String subAll = baseMapper.selectByBusVinSid(busVinSid);
if(loanSecondarySalesCost.getBankSettleCost().compareTo(BigDecimal.ZERO)>0){
if (loanSecondarySalesCost.getBankSettleCost().compareTo(BigDecimal.ZERO) > 0) {
all = all.add(loanSecondarySalesCost.getBankSettleCost()).subtract(new BigDecimal(subAll));
}
@ -807,11 +917,11 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
BigDecimal loanDeposit = loanSecondarySalesCost.getLoanDeposit();//贷款保证金
cssMoney = all.subtract(loanDeposit).subtract(bxbzjMoney);//车损失
String zjzyf = alrepaidAndArrVo.getWheFundOccMoney();
zjzyfMoney = zjzyfMoney.add(new BigDecimal(StringUtils.isBlank(zjzyf)?"0":zjzyf));
zjzyfMoney = zjzyfMoney.add(new BigDecimal(StringUtils.isBlank(zjzyf) ? "0" : zjzyf));
if(cssMoney.compareTo(BigDecimal.ZERO)>0){//贷方
if (cssMoney.compareTo(BigDecimal.ZERO) > 0) {//贷方
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoDf.setSummary(customerNumber + "扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -820,7 +930,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
voucherResultDetailDtoDf.setCredit(cssMoney.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoJf.setSummary(customerNumber + "扣回车辆再次销售-不追偿处理");
voucherResultDetailDtoJf.setSubjectNo("1911.05");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
@ -829,9 +939,9 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
voucherResultDetailDtoJf.setDebit(cssMoney.toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJf);
}
if(zjzyfMoney.compareTo(BigDecimal.ZERO)>0){
if (zjzyfMoney.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSummary(customerNumber + "扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("2191.05.00");
//核算部门
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@ -840,7 +950,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
voucherResultDetailDtoDf.setCredit(zjzyfMoney.negate().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoJf.setSummary(customerNumber + "扣回车辆再次销售-不追偿减免资金占用费");
voucherResultDetailDtoDf.setSubjectNo("1201.02.02");
//核算部门
voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
@ -852,7 +962,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
}
}
if(!voucherResultDetailDtos.isEmpty()){
if (!voucherResultDetailDtos.isEmpty()) {
voucher.setResultDetails(voucherResultDetailDtos);
finKingDeeFeign.saveVoucher(voucher);
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java
View File

@ -96,4 +96,7 @@ public class SecondarySalesAppVos {
private String salesOrderSid;
private CarModelVo jrfa;
@ApiModelProperty("竞价结果")
private String result;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesCostAppVo.java
View File

@ -97,4 +97,9 @@ public class SecondarySalesCostAppVo {
@ApiModelProperty("车辆评估")
private String vehicleEvaluation;
@ApiModelProperty("是否追偿")
private String isRecovery;
@ApiModelProperty("购方应交总金额")
private String purMeetCost;
}

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java
View File

@ -122,6 +122,11 @@ public class SecondarySalesService {
}
SecondarySalesAppVos secondarySalesAppVos = new SecondarySalesAppVos();
BeanUtil.copyProperties(resultBean.getData(), secondarySalesAppVos);
if ("1".equals(secondarySalesAppVos.getLoanSecondarySalesCost().getIsRecovery())){
secondarySalesAppVos.getLoanSecondarySalesCost().setIsRecovery("是");
}else {
secondarySalesAppVos.getLoanSecondarySalesCost().setIsRecovery("否");
}
secondarySalesAppVos.setPublishInfo(secondarySalesAppVos.getCreateDept() + "-" + secondarySalesAppVos.getCreateByName());
if (StringUtils.isNotBlank(secondarySalesAppVos.getNper()) && StringUtils.isNotBlank(secondarySalesAppVos.getCurrentPeriod())) {
secondarySalesAppVos.setQsCount(secondarySalesAppVos.getNper() + "/" + secondarySalesAppVos.getCurrentPeriod());

Write Preview
Loading…
Cancel
Save