From a8b8cc70a6d0c9db8f5b97f2cdce2809dfde0c5c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 27 Nov 2023 15:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java            | 12 ++++++++++++
 .../riskcenter/biz/loandiff/LoanDiffService.java     |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 80b8467cb5..65c8973b34 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -103,6 +103,8 @@ import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
 import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
 import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService;
 import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@@ -198,6 +200,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private LoanDiffFeign loanDiffFeign;
     @Autowired
     private OtherReceivableBillCreditResultService creditResultService;
+    @Autowired
+    private DictCommonFeign dictCommonFeign;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1831,6 +1835,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
+                                        creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1841,6 +1846,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                        creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1851,6 +1857,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                        creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1861,6 +1868,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                                        creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
                                 }
@@ -1938,6 +1946,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
+                                    creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
@@ -1948,6 +1957,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                    creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
@@ -1958,6 +1968,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                    creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
@@ -1970,6 +1981,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                                 creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
                                 creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                                creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
                                 collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             creditResult.setResultDetails(collectionDetailDtoListOne);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
index 3bab8916d3..18579203ad 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
@@ -342,6 +342,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -352,6 +353,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityDiscount().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -362,6 +364,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityOtherDiscount().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -372,6 +375,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getReceivedPremium().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -382,6 +386,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
                         creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.YWXSR.getType());
+                        creditResultDetailDto.setRemarks(CwSystemYT.YWXSR.getMark());
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }