From 53b4d62df61c5d4420385514479e8de6fc297e90 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 20 Aug 2024 16:43:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderVehicle.java | 6 +- .../LoanRepaymentSchedule.java | 2 + .../loansettleapply/LoanSettleApplyFeign.java | 6 + .../loansettleapply/SettleApplyListQuery.java | 2 + .../LoanRepaymentScheduleMapper.xml | 4 +- .../LoanRepaymentScheduleService.java | 8 ++ .../LoanSettleApplyMapper.java | 4 +- .../loansettleapply/LoanSettleApplyMapper.xml | 38 +++--- .../loansettleapply/LoanSettleApplyRest.java | 5 + .../LoanSettleApplyService.java | 119 ++++++++++++++---- .../risk/settleapply/SettleApplyFeign.java | 7 ++ .../biz/risk/settleapply/SettleApplyRest.java | 6 + .../risk/settleapply/SettleApplyService.java | 11 ++ 13 files changed, 177 insertions(+), 41 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java index 0d2957b1b7..2bd7a759e7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderVehicle.java
@@ -85,9 +87,11 @@ public class BusSalesOrderVehicle extends BaseEntity { private String reaRepaymentPhone; @ApiModelProperty("回购状态") private Integer repoState; - @ApiModelProperty("结清状态") + @ApiModelProperty("结清状态(默认0，结清申请提交2，终止或不通过重新设置0，客户确认结清设置3，认款所有应收=0设置1)") private Integer settleState; @ApiModelProperty("车牌号") private String vehMark; + @ApiModelProperty("结清申请提交时间") + private Date settleApplyDate; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java index 2df417c9b7..8457dd4e29 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java @@ -102,4 +102,6 @@ public class LoanRepaymentSchedule extends BaseEntity { private String bankSid; @ApiModelProperty("其他融资方sid") private String otherBankSid; + @ApiModelProperty("贷款保证金") + private BigDecimal bondAmounts; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java index 6a6e2314ce..4c5b6622e5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java @@ -76,6 +76,12 @@ public interface LoanSettleApplyFeign { @PostMapping(value = "/delegate") public ResultBean delegate(@RequestBody LoanSettleApplyDelegateQuery query); + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody LoanSettleApplyDelegateQuery query); + + @ApiOperation(value = "移动端详情") @PostMapping(value = "/getAppDetails") ResultBean getAppDetails(@RequestParam("sid") String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java index 7261d0f1fd..d77d11921e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java @@ -19,6 +19,8 @@ public class SettleApplyListQuery implements Query { private String borrowerName; @ApiModelProperty("车牌号") private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; @ApiModelProperty("机构全路径") private String orgPath; private String type;//1代表查询回购 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml index a38814bd74..a1ee48d881 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml @@ -6,7 +6,7 @@ vehCount,vinNo,loanContractSid,loanContractNo,bankContractNo,bankName,policyName,mainPeriod,mainRepayDate, mainLastDate,mainFirstRepay,mainMidRepay,mainLastRepay,otherPeriod,otherBankNo,otherRepayDate,otherFirstRepay, otherMidRepay,otherLastRepay,isOtherPolicy,sameBank,cwDeptNo,isDifferent,importTiredMoney,importPaymentMoney, - importInterest,importFund,orgSidPath,bankSid,otherBankSid) + importInterest,importFund,orgSidPath,bankSid,otherBankSid,bondAmounts) values (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.salesOrderSid},#{item.borrowerSid},#{item.borrowerName}, @@ -14,7 +14,7 @@ #{item.policyName},#{item.mainPeriod},#{item.mainRepayDate},#{item.mainLastDate},#{item.mainFirstRepay},#{item.mainMidRepay}, #{item.mainLastRepay},#{item.otherPeriod},#{item.otherBankNo},#{item.otherRepayDate},#{item.otherFirstRepay},#{item.otherMidRepay}, #{item.otherLastRepay},#{item.isOtherPolicy},#{item.sameBank},#{item.cwDeptNo},#{item.isDifferent},#{item.importTiredMoney}, - #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath},#{item.bankSid},#{item.otherBankSid} + #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath},#{item.bankSid},#{item.otherBankSid},#{item.bondAmounts} ) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 55370609d3..1818f6ef83 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -4933,6 +4933,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService returnList = new ArrayList<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); for (HistoryDataImportVo v : list) { + String depositMoney = ""; //贷款保证金 + if (StringUtils.isNotBlank(v.getDepositMoney())) { + depositMoney = v.getDepositMoney(); + } else { + depositMoney = ""; + } String Q = ""; if (StringUtils.isNotBlank(v.getTiredMoney())) { Q = v.getTiredMoney(); //累欠本金 @@ -5300,6 +5306,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService { String selectDk(@Param("busVinSid") String busVinSid, @Param("settingDate") String settingDate); - int updateBus(String busVinSid); + int updateBus(@Param("busVinSid")String busVinSid,@Param("state")String state); LoanRepaymentPlanDetails selectByBusVinSidAndDesc(String busVinSid); BusSalesOrder selectByOrderSid(String saleOrderSid); FinUncollectedReceivablesDetailedJR selectByType(@Param("busSid") String sid, @Param("type") String type); + + int updateBusAndSettleApplyDate(@Param("busVinSid")String busVinSid, @Param("state")String state, @Param("date")String date); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml index 46bfaa660b..1c01338ca7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml @@ -61,21 +61,24 @@ - \ No newline at end of file + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java index ba41a17ecc..d375d3d8d3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java @@ -99,6 +99,11 @@ public class LoanSettleApplyRest implements LoanSettleApplyFeign { return loanSettleApplyService.delegate(query); } + @Override + public ResultBean assignTask(LoanSettleApplyDelegateQuery query) { + return loanSettleApplyService.assignTask(query); + } + @Override public ResultBean getAppDetails(String sid) { return loanSettleApplyService.getAppDetails(sid); 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 efd1a5957b..825b9be13d 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 @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; @@ -29,6 +30,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule; import com.yxt.anrui.riskcenter.api.loansettleapply.*; import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*; import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost; @@ -40,6 +42,7 @@ import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompany import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleDto; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; +import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService; import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostMapper; import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostService; import com.yxt.anrui.riskcenter.biz.loansettlecompanycost.LoanSettleCompanyCostMapper; @@ -105,7 +108,8 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { - loanSettleApplyDetailsVo.setConfirmAtn(true); + if (StringUtils.isNotBlank(loanSettleApply.getNodeState())) { + if (loanSettleApply.getNodeState().equals("已办结")) { + if (loanSettleApply.getState().intValue() == 0) { + if (loanSettleCompanyReduction.getAmountTo().compareTo(BigDecimal.ZERO) > 0) { + loanSettleApplyDetailsVo.setConfirmAtn(true); + } + } + } } + } if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) { loanSettleApplyDetailsVo.setShowHg(true); @@ -449,6 +461,7 @@ public class LoanSettleApplyService extends MybatisBaseService i) { //大于规定次数扣除全部保证金 deductionAmount - settleApplyCommonVo.setDeductionAmount(loanSolutionsDetail.getBondAmounts().toString()); + settleApplyCommonVo.setDeductionAmount(bondAmounts.toString()); } else { BigDecimal sum = new BigDecimal(0); for (int j = 0; j < overDueCount; j++) { @@ -566,6 +582,9 @@ public class LoanSettleApplyService extends MybatisBaseService"; if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) { - variables.put("orderNames", "提前结清申请"); + variables.put("orderNames", append + "提前结清申请"); + } else { + variables.put("orderNames", append + "结清申请"); } bv.setFormVariables(variables); List orgPathList = Arrays.asList(dto.getOrgPath().split("/")); @@ -690,12 +720,22 @@ public class LoanSettleApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + loanSettleApply = fetchBySid(query.getBusinessSid()); + if (loanSettleApply.getNodeState().equals("终止")) { + //修改车辆结算状态为0 + baseMapper.updateBus(loanSettleApply.getBusVinSid(),"0"); + } return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -1421,6 +1466,11 @@ public class LoanSettleApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + loanSettleApply = fetchBySid(query.getBusinessSid()); + if (loanSettleApply.getNodeState().equals("终止")) { + //修改车辆结算状态为0 + baseMapper.updateBus(loanSettleApply.getBusVinSid(),"0"); + } return rb.success().setData(resultBean.getData()); } } @@ -1436,6 +1486,15 @@ public class LoanSettleApplyService extends MybatisBaseService getAppDetails(String sid) { ResultBean rb = ResultBean.fireFail(); SettleApplyAppVo settleApplyAppVo = new SettleApplyAppVo(); @@ -1541,28 +1600,33 @@ public class LoanSettleApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.getListPage(page, qw); @@ -1572,7 +1636,16 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + return rb.setMsg("只能在结清申请发起当日确认客户结清，若需结清，请重新发起结清申请！"); + } else { + pushConfirm(sid); + loanSettleApply.setState(1); + baseMapper.updateById(loanSettleApply); + } return rb.success(); } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyFeign.java index 15d6bdec61..f4b3e8d8be 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyFeign.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.risk.settleapply; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery; import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDelegateQuery; import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDto; import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyQuery; @@ -57,4 +58,10 @@ public interface SettleApplyFeign { @PutMapping(value = "/delegate") @ResponseBody public ResultBean delegate(@RequestBody SettleApplyDelegateQuery delegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody SettleApplyDelegateQuery delegateQuery); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyRest.java index 9c69159bbc..43148290c9 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyRest.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.biz.risk.settleapply; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery; import com.yxt.anrui.terminal.api.risk.settleapply.SettleApplyAppVos; import com.yxt.anrui.terminal.api.risk.settleapply.SettleApplyFeign; import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDelegateQuery; @@ -59,4 +60,9 @@ public class SettleApplyRest implements SettleApplyFeign { public ResultBean delegate(SettleApplyDelegateQuery delegateQuery) { return settleApplyService.delegate(delegateQuery); } + + @Override + public ResultBean assignTask(SettleApplyDelegateQuery delegateQuery) { + return settleApplyService.assignTask(delegateQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyService.java index 7b19ba80c4..c53c4ae90e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyService.java @@ -1,12 +1,14 @@ package com.yxt.anrui.terminal.biz.risk.settleapply; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.SecondarySalesAppVo; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign; import com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyAppVo; import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery; import com.yxt.anrui.terminal.api.base.common.CarModelVo; import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVos; import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesCostAppVo; @@ -138,4 +140,13 @@ public class SettleApplyService { ResultBean delegate = loanSettleApplyFeign.delegate(delegateQuery1); return rb.success(); } + + public ResultBean assignTask(SettleApplyDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + LoanSettleApplyDelegateQuery delegateQuery1 = new + LoanSettleApplyDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = loanSettleApplyFeign.assignTask(delegateQuery1); + return rb.success(); + } } From 6472dc01b98a249913b88e3e07184daab3df8bb4 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 20 Aug 2024 16:57:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesDetailedFeign.java | 4 ++-- .../FinUncollectedReceivablesDetailedJRFeign.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java index 7f067b381a..f02ecc1cd5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java @@ -91,9 +91,9 @@ public interface FinSelectedReceivablesDetailedFeign { @ApiOperation("保存推送的实收") @PostMapping("/saveAll") - ResultBean saveAll(List list); + ResultBean saveAll(@RequestBody List list); @ApiOperation("根据维修工单sid查询待审核和已审核的认款金额之和") @GetMapping("/selRkByBillSid") ResultBean selRkByBillSid(@RequestParam("billSid") String billSid); -} \ No newline at end of file +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java index 08b960db58..1dac4fe96c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java @@ -74,7 +74,7 @@ public interface FinUncollectedReceivablesDetailedJRFeign { @ApiOperation("应收添加") @PostMapping("/saveAll") - public ResultBean saveAll(List list); + public ResultBean saveAll(@RequestBody List list); @ApiOperation("导入数据批量添加") @PostMapping("/saveList")