Browse Source

修改

master
ligaode 2 weeks ago
parent
commit
b0120fb568
  1. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@ -1718,7 +1718,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
} }
if (payPriceTotal.compareTo(exePayPriceTotal) == -1) { if (payPriceTotal.compareTo(exePayPriceTotal) == -1) {
//借方 //借方
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoJF.setSubjectNo("1009.03"); voucherResultDetailDtoJF.setSubjectNo("1009.03");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode()); voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
@ -1727,13 +1727,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString()); voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF); voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方 //贷方
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount()); voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString()); voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf); voucherResultDetailDtos.add(voucherResultDetailDtoDf);
} else { } else {
//借方 //借方
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoJF.setSubjectNo("2111"); voucherResultDetailDtoJF.setSubjectNo("2111");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode()); voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
@ -1742,14 +1742,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(bzj).toString()); voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(bzj).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF); voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方1 //贷方1
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoDf.setSubjectNo("1009.03"); voucherResultDetailDtoDf.setSubjectNo("1009.03");
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
voucherResultDetailDtoDf.setBank(key); voucherResultDetailDtoDf.setBank(key);
voucherResultDetailDtoDf.setCredit(exePayPriceTotal.add(bzj).subtract(finPaymentrecord.getCost()).toString()); voucherResultDetailDtoDf.setCredit(exePayPriceTotal.add(bzj).subtract(finPaymentrecord.getCost()).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf); voucherResultDetailDtos.add(voucherResultDetailDtoDf);
//贷方2 //贷方2
voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount()); voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString()); voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf2); voucherResultDetailDtos.add(voucherResultDetailDtoDf2);

Loading…
Cancel
Save