From 4a138b3b0feaeddaff419cb50b479443bd7391b8 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 29 Aug 2024 17:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=B8=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...UncollectedReceivablesDetailedJRMapper.xml | 2 +- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 3 +- .../LoanSettleVehicleVo.java | 4 +- .../LoanRepaymentPlanDetailsMapper.java | 2 + .../LoanRepaymentPlanDetailsMapper.xml | 8 + .../LoanRepaymentPlanDetailsService.java | 4 + .../LoanSettleApplyMapper.java | 4 + .../loansettleapply/LoanSettleApplyMapper.xml | 12 ++ .../LoanSettleApplyService.java | 138 +++++++++--------- .../LoanSettleVehicleMapper.xml | 38 ++--- .../LoanSettleVehicleService.java | 1 + .../AsServiceItemApplyDetailsVo.java | 2 + .../as/api/asserviceitemapply/SitemsVo.java | 2 + .../AsServiceItemApplyRest.java | 8 + .../AsServiceItemApplyService.java | 14 ++ 15 files changed, 154 insertions(+), 88 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml index 1cee95708d..f749f3fe47 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml @@ -194,7 +194,7 @@ )), 0 ) < p.dueMoney --- AND p.dueDate < last_day(date_sub(now(),interval -1 month)) + AND (p.dueDate < last_day(date_sub( now(), INTERVAL - 1 MONTH )) OR v.settleState = 3) AND p.useOrgSid = #{userOrgSid} UNION ALL SELECT diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 54b714ce36..a522b02ba9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -381,7 +381,6 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { List voucherDetails = voucher.getVoucherDetails(); if (!voucherDetails.isEmpty()) { for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) { - Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方 dto1.setSummary(voucherDetail.getBankName() + "划扣"); @@ -548,8 +547,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { } dto1.setDebit(String.valueOf(amountAll)); resultDetails.add(0, dto1); - newVoucher.setResultDetails(resultDetails); } + newVoucher.setResultDetails(resultDetails); } log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher)); return voucherService.saveVoucher(newVoucher); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleVo.java index 0d4add13ff..1cac49bce2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlevehicle/LoanSettleVehicleVo.java @@ -33,8 +33,8 @@ public class LoanSettleVehicleVo { @ApiModelProperty("贷款人") private String loanName; - @ApiModelProperty("期数") - private String peroid; +// @ApiModelProperty("期数") +// private String peroid; @ApiModelProperty("结清日期") private String settingDate; @ApiModelProperty("资方结清金额") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java index 42945db08d..99a80694ba 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java @@ -99,4 +99,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper list); List selByMainSidAndVinNo(@Param("scheduleSid") String scheduleSid, @Param("vinNo") String vinNo); + + void updatePaymentMoneyBySids(@Param("planSids") List planSids); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index c1bbd259e9..ba050bbc25 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -595,6 +595,14 @@ #{item.id} + + update loan_repayment_plan_details + set paymentMoney = 0,paymentInterest = 0 + where sid in + + #{planSid} + + @@ -335,4 +343,8 @@ FROM ( LEFT JOIN loan_repayment_history as h ON p.sid = h.planDetailSid WHERE p.busVinSid = #{busVinSid} AND h.updateState = '1' AND h.dataTime > #{formatDate} + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index ffeefa4019..9448e188ed 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -757,6 +757,8 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { //公司其他费用应收 @@ -923,8 +925,6 @@ public class LoanSettleApplyService extends MybatisBaseService histories = new ArrayList<>();//还款记录 List selectList = new ArrayList<>(); - List payments = new ArrayList<>(); //消减垫款金额列表 - List yqlx = new ArrayList<>(); //消减逾期利息列表 LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid()); String scheduleSid = planDetails.getScheduleSid(); LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid); @@ -964,7 +964,6 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { BigDecimal money = new BigDecimal(m.getMoney()); - BigDecimal mm = BigDecimal.ZERO; String sid = m.getSid(); String mSid = m.getMSid(); LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -981,26 +980,14 @@ public class LoanSettleApplyService extends MybatisBaseService= 0) { - mm = money; history.setActualMoney(money); histories.add(history); deposit = deposit.subtract(money); } else { - mm = deposit; history.setActualMoney(deposit); histories.add(history); deposit = BigDecimal.ZERO; } - LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid); - if (null != pd.getPaymentMoney()) { - BigDecimal paymentMoney = pd.getPaymentMoney(); - if (mm.compareTo(paymentMoney) >= 0) { - pd.setPaymentMoney(new BigDecimal("0")); - } else { - pd.setPaymentMoney(paymentMoney.subtract(mm)); - } - payments.add(pd); - } } } } @@ -1013,21 +1000,17 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { BigDecimal money = new BigDecimal(m.getMoney()); - BigDecimal mm = BigDecimal.ZERO; String sid = m.getSid(); - LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid); FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); fin.setCreateBySid(userSid); fin.setRemarks("结转"); - fin.setVIN(pd.getVinNo()); - fin.setUseOrgSid(pd.getUseOrgSid()); + fin.setVIN(planDetails.getVinNo()); + fin.setUseOrgSid(planDetails.getUseOrgSid()); fin.setReceivablesName("资方逾期利息"); if (deposit.compareTo(money) >= 0) { - mm = money; fin.setSubscriptionMoney(money); deposit = deposit.subtract(money); } else { - mm = deposit; fin.setSubscriptionMoney(deposit); deposit = BigDecimal.ZERO; } @@ -1036,18 +1019,9 @@ public class LoanSettleApplyService extends MybatisBaseService= 0) { - pd.setPaymentInterest(new BigDecimal("0")); - } else { - pd.setPaymentInterest(paymentInterest.subtract(mm)); - } - yqlx.add(pd); - } } } } @@ -1204,12 +1178,6 @@ public class LoanSettleApplyService extends MybatisBaseService 0 && !histories.isEmpty()) { loanRepaymentHistoryService.saveList(histories); } - if (payments.size() > 0 && !payments.isEmpty()) { - loanRepaymentPlanDetailsService.updateList(payments); - } - if (yqlx.size() > 0 && !yqlx.isEmpty()) { - loanRepaymentPlanDetailsService.updateList(yqlx); - } selectList.removeAll(Collections.singleton(null)); if (selectList.size() > 0 && !selectList.isEmpty()) { ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList); @@ -1222,8 +1190,6 @@ public class LoanSettleApplyService extends MybatisBaseService histories = new ArrayList<>();//还款记录 List selectList = new ArrayList<>(); - List payments = new ArrayList<>(); //消减垫款金额列表 - List yqlx = new ArrayList<>(); //消减逾期利息列表 LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid()); String scheduleSid = planDetails.getScheduleSid(); LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid); @@ -1277,12 +1243,6 @@ public class LoanSettleApplyService extends MybatisBaseService 0 && !histories.isEmpty()) { - loanRepaymentHistoryService.saveList(histories); + //资方退还垫款应收 + List p7 = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "007"); + p7.removeAll(Collections.singleton(null)); + if (!p7.isEmpty() && p7.size() > 0) { + for (PlanNoReturnMoney m : p7) { + BigDecimal money = new BigDecimal(m.getMoney()); + String sid = m.getSid(); + LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid); + FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); + fin.setCreateBySid(userSid); + fin.setRemarks("减免"); + fin.setVIN(pd.getVinNo()); + fin.setUseOrgSid(pd.getUseOrgSid()); + fin.setReceivablesName("资方退还垫款"); + fin.setSubscriptionMoney(money); + fin.setSubscriptionDate(DateUtil.today()); + fin.setAuditState(3); + fin.setAuditDate(DateUtil.today()); + fin.setReceivablesSid(m.getJrSid()); + fin.setKxState("01"); + fin.setUseOrgName(pd.getUseOrgName()); + fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); + selectList.add(fin); + } } - if (payments.size() > 0 && !payments.isEmpty()) { - loanRepaymentPlanDetailsService.updateList(payments); + //对应的垫款金额、资方逾期利息设置0 + List ps = baseMapper.selectPlanListByBusVinSid(busVinSid); + ps.removeAll(Collections.singleton(null)); + Set set = new HashSet<>(); + if (!ps.isEmpty() && ps.size() > 0) { + for (LoanRepaymentPlanDetails pp : ps) { + if (pp.getPaymentMoney() != null) { + if (pp.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) { + + } else { + set.add(pp.getSid()); + } + } + if (pp.getPaymentInterest() != null) { + if (pp.getPaymentInterest().compareTo(BigDecimal.ZERO) == 0) { + + } else { + set.add(pp.getSid()); + } + } + } } - if (yqlx.size() > 0 && !yqlx.isEmpty()) { - loanRepaymentPlanDetailsService.updateList(yqlx); + List sids = new ArrayList<>(set); + if (!sids.isEmpty() && sids.size() > 0) { + loanRepaymentPlanDetailsService.updatePaymentMoneyBySids(sids); + } + if (histories.size() > 0 && !histories.isEmpty()) { + loanRepaymentHistoryService.saveList(histories); } selectList.removeAll(Collections.singleton(null)); if (selectList.size() > 0 && !selectList.isEmpty()) { ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList); } } + //--------------------资方结清款到出纳代付款列表------------------ - private void pushBankSettlePrice(LoanSettleApply loanSettleApply) { + private void pushBankSettlePrice(LoanSettleApply loanSettleApply) { if (StringUtils.isBlank(loanSettleApply.getBusSid())) { LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(loanSettleApply.getSid()); if (null != bankCost) { @@ -2223,7 +2223,7 @@ public class LoanSettleApplyService extends MybatisBaseService - \ No newline at end of file + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleService.java index 66409dc61d..5f5e9f3635 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlevehicle/LoanSettleVehicleService.java @@ -127,6 +127,7 @@ public class LoanSettleVehicleService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.selectPageVo(page, qw); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDetailsVo.java index 497c5762b9..a10ca5c78c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/AsServiceItemApplyDetailsVo.java @@ -68,6 +68,7 @@ public class AsServiceItemApplyDetailsVo implements Vo { private String taskId; @ApiModelProperty("实例id") private String instanceId; + private String procInsId; @ApiModelProperty("创建组织sid分公司") private String createOrgSid; // 创建组织sid @ApiModelProperty("使用组织sid分公司") @@ -80,6 +81,7 @@ public class AsServiceItemApplyDetailsVo implements Vo { private String remarks; // 备注 @ApiModelProperty("附件") private List file = new ArrayList<>(); // 附件 + private List file2 = new ArrayList<>(); // 附件 @ApiModelProperty("维修项目列表") private List sitemsVos; // 维修项目列表 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/SitemsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/SitemsVo.java index aaf9416b03..a11f0685d7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/SitemsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitemapply/SitemsVo.java @@ -36,7 +36,9 @@ public class SitemsVo { private String remarks; @ApiModelProperty("是否为预约项目，直接返回是否无需转换") private String isReserve; + private String isReserve2; @ApiModelProperty("是否为洗车项目，直接返回是否无需转换") private String isClean; + private String isClean2; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyRest.java index 6e8a45e4d0..ecc6bc18ee 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyRest.java @@ -100,4 +100,12 @@ public class AsServiceItemApplyRest { AsServiceItemApplyDetailsVo vo = asServiceItemApplyService.applyInit(sids); return rb.success().setData(vo); } + + @ApiOperation("app详情") + @GetMapping("/fetchDetailsBySid2/{sid}") + public ResultBean fetchDetailsBySid2(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + AsServiceItemApplyDetailsVo vo = asServiceItemApplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyService.java index 850083f25a..3e4b6baf0b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitemapply/AsServiceItemApplyService.java @@ -251,16 +251,28 @@ public class AsServiceItemApplyService extends MybatisBaseService records = asServiceItemApplyRecordService.selByMainSid(sid); List sitemsVos = new ArrayList<>(); + List file2 = new ArrayList<>(); if (!records.isEmpty()) { for (AsServiceItemApplyRecord record : records) { SitemsVo s = new SitemsVo(); AsServiceItem item = asServiceItemService.fetchBySid(record.getSitemSid()); BeanUtil.copyProperties(item, s, "id", "sid"); s.setSitemSid(item.getSid()); + if (item.getIsClean().intValue() == 0) { + s.setIsClean2("否"); + } else if (item.getIsClean().intValue() == 1) { + s.setIsClean2("是"); + } + if (item.getIsReserve().intValue() == 0) { + s.setIsReserve2("否"); + } else if (item.getIsReserve().intValue() == 1) { + s.setIsReserve2("是"); + } sitemsVos.add(s); } } @@ -273,9 +285,11 @@ public class AsServiceItemApplyService extends MybatisBaseService