优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -151,4 +151,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     BusSalesOrder selectByOrderSid(String salesOrderSid);
 
     LoanFinBank selectFinBnk(String contractNo);
+
+    LoanFinBank selectByBankSid(String bankSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -294,4 +294,8 @@
         where bo.contractNo = #{contractNo}
 
     </select>
+
+    <select id="selectByBankSid" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank">
+        select * from anrui_riskcenter.loan_fin_bank where sid = #{bankSid}
+    </select>
 </mapper>

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

@@ -1745,12 +1745,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                     //查询主方案的资方和其他融的资方是否一致
                     loanFinPolicy = baseMapper.selectBySoll(loanSolutions.getPolicySid());
+
                     loanFinOtherPolicy = baseMapper.selectByOtherSid(loanSolutionsOtherpolicy.getOtherPolicySid());
+                    if(loanFinOtherPolicy != null){
                         if(!loanFinPolicy.getBankSid().equals(loanFinOtherPolicy.getBankSid())){
                             isTue =true;
                         }
                     }
 
+                }
+
                 BigDecimal decimalAll = new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()).subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
                 if(finSelectedReceivablesDetailed.getSubscriptionMoney().compareTo(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney())) != 0){
                     //有差额
@@ -1802,6 +1806,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             loanDiffsDto.setLoanDiffDetailssDtos(loanDiffDetailssDtos);
                         }else{
                             CapitalCreditResult creditResult = new CapitalCreditResult();
+                            if(loanFinPolicy != null){
+                                LoanFinBank loanFinBank = baseMapper.selectByBankSid(loanFinPolicy.getBankSid());
+                                creditResult.setBankName(loanFinBank.getBankNo());
+                            }
                             //推送其他应收单
                             BusSalesOrder busSalesOrder = baseMapper.selectByOrderSid(busSalesOrderVehicle.getSalesOrderSid());
                             String customerNumber = "";

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

@@ -32,7 +32,9 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
 //        if (creditResult.getBillNo() == null) {
 //            return rb.setMsg("单据编号不能为空");
 //        }
+        if(StringUtils.isNotBlank(creditResult.getBillNo())){
             map_fEntityModel_.put("FBillNo", creditResult.getBillNo());
+        }
         //业务日期
         if (creditResult.getBussDate() == null) {
             return rb.setMsg("业务日期不能为空");
@@ -61,7 +63,9 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
         map_fEntityModel_.put("FDEPARTMENTID", creditResult.getResultDetails().get(0).getDearDept());
         //银行
         map_fEntityModel_.put("F_PAEZ_Base", creditResult.getBankName());
+        if(StringUtils.isNotBlank(creditResult.getRemarks())){
             map_fEntityModel_.put("FAR_OtherRemarks",creditResult.getRemarks());
+        }
         List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetails = creditResult.getResultDetails() == null ? new ArrayList<>() : creditResult.getResultDetails();
         //准备 物料列表的数据
         ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails);
@@ -104,7 +108,9 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
             m.put("FCOSTDEPARTMENTID", c.getDearDept());
             m.put("FNOTAXAMOUNTFOR", c.getExTaxMoney());
             m.put("F_PAEZ_Assistant1", c.getUseTo());
+            if(StringUtils.isNotBlank(c.getRemarks())){
                 m.put("FCOMMENT",c.getRemarks());
+            }
             collectionDetailMap.add(m);
         }
         return rb.success().setData(collectionDetailMap);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json

@@ -3,7 +3,7 @@
   "FBillTypeID": {
     "FNUMBER": "QTYSD01_SYS"
   },
-  "FBillNo": "@KD_FBillNo",
+  "FBillNo": "",
   "FDATE": "@KD_FDATE",
   "FENDDATE_H": "@KD_FENDDATE_H",
   "FISINIT": "false",