diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java index 6d49d2038b..bc2a8ee71b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java @@ -30,6 +30,7 @@ public class CapitalCreditResult { public String bussDate; @ApiModelProperty("银行") public String bankName; + public String remarks; @ApiModelProperty("收款明细") public List resultDetails; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java index a50faac765..760a82dab1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java @@ -61,6 +61,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService { map_fEntityModel_.put("FDEPARTMENTID", creditResult.getResultDetails().get(0).getDearDept()); //银行 map_fEntityModel_.put("F_PAEZ_Base", creditResult.getBankName()); + map_fEntityModel_.put("FAR_OtherRemarks",creditResult.getRemarks()); List collectionDetails = creditResult.getResultDetails() == null ? new ArrayList<>() : creditResult.getResultDetails(); //准备 物料列表的数据 ResultBean>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails); 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 829a34aac3..555d90bb98 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 @@ -35,6 +35,9 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loandiff.*; import com.yxt.anrui.riskcenter.api.loandiff.flowable.*; import com.yxt.anrui.riskcenter.api.loandiffdetails.*; +import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.PushVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate; @@ -43,6 +46,9 @@ import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo; import com.yxt.anrui.riskcenter.api.loantemplate.flowable.SubmitTemplateDto; import com.yxt.anrui.riskcenter.api.loantemplate.flowable.TemplateApplyNodeVo; import com.yxt.anrui.riskcenter.biz.loandiffdetails.LoanDiffDetailsService; +import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService; +import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService; +import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService; import com.yxt.anrui.riskcenter.biz.loantemplate.LoanTemplateMapper; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -95,6 +101,12 @@ public class LoanDiffService extends MybatisBaseService